Template /etc/sogo/sogo.conf instead of /var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults

11 years ago · fd56f72c98
parent f34b69c279
commit fd56f72c98
19 changed files with 6 additions and 8 deletions
--- a/2
+++ b/2
@ -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));
--- 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
--- a/root/etc/e-smith/templates.metadata/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults
+++ b/root/etc/e-smith/templates.metadata/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults
--- a/root/etc/e-smith/templates/etc/sogo/sogo.conf/10start
+++ b/root/etc/e-smith/templates/etc/sogo/sogo.conf/10start
@ -0,0 +1,2 @@
+\{
+
--- a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/15mysql
+++ b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/15mysql
--- a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/16memcached
+++ b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/16memcached
--- a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/20mail
+++ b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/20mail
--- a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/25notifications
+++ b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/25notifications
--- a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/30defaultPrefs
+++ b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/30defaultPrefs
--- a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/35external
+++ b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/35external
--- a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/40sieve
+++ b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/40sieve
--- a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/45admins
+++ b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/45admins
--- a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/50timezone
+++ b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/50timezone
--- a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/55authSource
+++ b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/55authSource
--- a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/60various
+++ b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/60various
--- a/root/etc/e-smith/templates/etc/sogo/sogo.conf/99end
+++ b/root/etc/e-smith/templates/etc/sogo/sogo.conf/99end
@ -0,0 +1 @@
+\}
--- a/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/template-begin
+++ b/root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/template-begin
--- 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
@ -1,5 +0,0 @@
-\{
-    NSGlobalDomain = \{
-    \};
-    sogod = \{
-
--- 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
@ -1,2 +0,0 @@
-    \};
-\}