From fd56f72c9842c419974d6bdde9273e4d76a85d4a Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 12 Dec 2013 10:41:10 +0100 Subject: [PATCH] Template /etc/sogo/sogo.conf instead of /var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults --- createlinks | 2 +- root/etc/e-smith/events/actions/sogo-upgrade | 2 ++ .../sogo/GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf} | 0 root/etc/e-smith/templates/etc/sogo/sogo.conf/10start | 2 ++ .../GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/15mysql | 0 .../Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/16memcached | 0 .../GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/20mail | 0 .../Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/25notifications | 0 .../Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/30defaultPrefs | 0 .../Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/35external | 0 .../GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/40sieve | 0 .../Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/45admins | 0 .../Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/50timezone | 0 .../Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/55authSource | 0 .../Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/60various | 0 root/etc/e-smith/templates/etc/sogo/sogo.conf/99end | 1 + .../Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/template-begin | 0 .../templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/10start | 5 ----- .../templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/99end | 2 -- 19 files changed, 6 insertions(+), 8 deletions(-) rename root/etc/e-smith/templates.metadata/{var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf} (100%) create mode 100644 root/etc/e-smith/templates/etc/sogo/sogo.conf/10start rename root/etc/e-smith/templates/{var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/15mysql (100%) rename root/etc/e-smith/templates/{var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/16memcached (100%) rename root/etc/e-smith/templates/{var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/20mail (100%) rename root/etc/e-smith/templates/{var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/25notifications (100%) rename root/etc/e-smith/templates/{var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/30defaultPrefs (100%) rename root/etc/e-smith/templates/{var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/35external (100%) rename root/etc/e-smith/templates/{var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/40sieve (100%) rename root/etc/e-smith/templates/{var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/45admins (100%) rename root/etc/e-smith/templates/{var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/50timezone (100%) rename root/etc/e-smith/templates/{var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/55authSource (100%) rename root/etc/e-smith/templates/{var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/60various (100%) create mode 100644 root/etc/e-smith/templates/etc/sogo/sogo.conf/99end rename root/etc/e-smith/templates/{var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults => etc/sogo/sogo.conf}/template-begin (100%) delete mode 100644 root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/10start delete mode 100644 root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/99end diff --git a/createlinks b/createlinks index 039855e..494e7c8 100755 --- a/createlinks +++ b/createlinks @@ -7,7 +7,7 @@ service_link_enhanced("sogod", "S85", "7"); templates2events("/etc/e-smith/sql/init/sogo", qw(email-update bootstrap-console-save)); templates2events("/etc/cron.d/sogo-alarm", qw(email-update bootstrap-console-save)); -templates2events("/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults", qw(email-update bootstrap-console-save pre-backup)); +templates2events("/etc/sogo/sogo.conf", qw(email-update bootstrap-console-save pre-backup)); templates2events("/etc/sysconfig/sogo", qw(email-update bootstrap-console-save)); templates2events("/etc/logrotate.d/sogo", qw(email-update bootstrap-console-save)); templates2events("/etc/pam.d/dovecot", qw(email-update bootstrap-console-save)); diff --git a/root/etc/e-smith/events/actions/sogo-upgrade b/root/etc/e-smith/events/actions/sogo-upgrade index 2dfd531..8e53e65 100644 --- a/root/etc/e-smith/events/actions/sogo-upgrade +++ b/root/etc/e-smith/events/actions/sogo-upgrade @@ -4,3 +4,5 @@ if [ $? -eq 0 ]; then /usr/sbin/usermod -d /var/lib/sogo -m -s /sbin/nologin -c "SOGo daemon" sogo 2>/dev/null fi + +rm -f /var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults diff --git a/root/etc/e-smith/templates.metadata/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults b/root/etc/e-smith/templates.metadata/etc/sogo/sogo.conf similarity index 100% rename from root/etc/e-smith/templates.metadata/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults rename to root/etc/e-smith/templates.metadata/etc/sogo/sogo.conf diff --git a/root/etc/e-smith/templates/etc/sogo/sogo.conf/10start b/root/etc/e-smith/templates/etc/sogo/sogo.conf/10start new file mode 100644 index 0000000..c6a3ac9 --- /dev/null +++ b/root/etc/e-smith/templates/etc/sogo/sogo.conf/10start @@ -0,0 +1,2 @@ +\{ + diff --git a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/15mysql b/root/etc/e-smith/templates/etc/sogo/sogo.conf/15mysql similarity index 100% rename from root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/15mysql rename to root/etc/e-smith/templates/etc/sogo/sogo.conf/15mysql diff --git a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/16memcached b/root/etc/e-smith/templates/etc/sogo/sogo.conf/16memcached similarity index 100% rename from root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/16memcached rename to root/etc/e-smith/templates/etc/sogo/sogo.conf/16memcached diff --git a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/20mail b/root/etc/e-smith/templates/etc/sogo/sogo.conf/20mail similarity index 100% rename from root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/20mail rename to root/etc/e-smith/templates/etc/sogo/sogo.conf/20mail diff --git a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/25notifications b/root/etc/e-smith/templates/etc/sogo/sogo.conf/25notifications similarity index 100% rename from root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/25notifications rename to root/etc/e-smith/templates/etc/sogo/sogo.conf/25notifications diff --git a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/30defaultPrefs b/root/etc/e-smith/templates/etc/sogo/sogo.conf/30defaultPrefs similarity index 100% rename from root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/30defaultPrefs rename to root/etc/e-smith/templates/etc/sogo/sogo.conf/30defaultPrefs diff --git a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/35external b/root/etc/e-smith/templates/etc/sogo/sogo.conf/35external similarity index 100% rename from root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/35external rename to root/etc/e-smith/templates/etc/sogo/sogo.conf/35external diff --git a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/40sieve b/root/etc/e-smith/templates/etc/sogo/sogo.conf/40sieve similarity index 100% rename from root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/40sieve rename to root/etc/e-smith/templates/etc/sogo/sogo.conf/40sieve diff --git a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/45admins b/root/etc/e-smith/templates/etc/sogo/sogo.conf/45admins similarity index 100% rename from root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/45admins rename to root/etc/e-smith/templates/etc/sogo/sogo.conf/45admins diff --git a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/50timezone b/root/etc/e-smith/templates/etc/sogo/sogo.conf/50timezone similarity index 100% rename from root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/50timezone rename to root/etc/e-smith/templates/etc/sogo/sogo.conf/50timezone diff --git a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/55authSource b/root/etc/e-smith/templates/etc/sogo/sogo.conf/55authSource similarity index 100% rename from root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/55authSource rename to root/etc/e-smith/templates/etc/sogo/sogo.conf/55authSource diff --git a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/60various b/root/etc/e-smith/templates/etc/sogo/sogo.conf/60various similarity index 100% rename from root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/60various rename to root/etc/e-smith/templates/etc/sogo/sogo.conf/60various diff --git a/root/etc/e-smith/templates/etc/sogo/sogo.conf/99end b/root/etc/e-smith/templates/etc/sogo/sogo.conf/99end new file mode 100644 index 0000000..dbea7aa --- /dev/null +++ b/root/etc/e-smith/templates/etc/sogo/sogo.conf/99end @@ -0,0 +1 @@ +\} diff --git a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/template-begin b/root/etc/e-smith/templates/etc/sogo/sogo.conf/template-begin similarity index 100% rename from root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/template-begin rename to root/etc/e-smith/templates/etc/sogo/sogo.conf/template-begin diff --git a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/10start b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/10start deleted file mode 100644 index 2ffdaf2..0000000 --- a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/10start +++ /dev/null @@ -1,5 +0,0 @@ -\{ - NSGlobalDomain = \{ - \}; - sogod = \{ - diff --git a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/99end b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/99end deleted file mode 100644 index 0b195f2..0000000 --- a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/99end +++ /dev/null @@ -1,2 +0,0 @@ - \}; -\}