diff -urN smeserver-sogo-1.6.old/createlinks smeserver-sogo-1.6/createlinks --- smeserver-sogo-1.6.old/createlinks 2017-04-28 13:32:32.000000000 +0100 +++ smeserver-sogo-1.6/createlinks 2023-01-09 17:28:58.566864500 +0000 @@ -2,27 +2,33 @@ use esmith::Build::CreateLinks qw(:all); +#action needed in case we have a systemd unit +$event = "smeserver-sogo-update"; +event_link("systemd-default", $event, "10"); +event_link("systemd-reload", $event, "50"); + + service_link_enhanced("memcached", "S55", "7"); service_link_enhanced("sogod", "S85", "7"); -templates2events("/etc/e-smith/sql/init/30sogo_mysql_create_database", qw(sogo-modify post-install bootstrap-console-save)); -templates2events("/etc/e-smith/sql/init/31sogo_mysql_update_privileges", qw(sogo-modify post-install bootstrap-console-save)); -templates2events("/etc/e-smith/sql/init/31sogo_upgrade", qw(sogo-modify post-install post-upgrade)); -templates2events("/etc/e-smith/sql/init/32sogo_upgrade_2.3", qw(sogo-modify post-install post-upgrade)); - -templates2events("/var/lib/sogo/smeserver/sogo_mysql_update_privileges.sql", qw(sogo-modify post-install bootstrap-console-save)); - -templates2events("/var/service/tinydns/root/data", qw( email-update sogo-modify)); -templates2events("/etc/httpd/conf/httpd.conf", qw( email-update sogo-modify)); -templates2events("/etc/sogo/sogo.conf", qw( email-update sogo-modify bootstrap-console-save)); -templates2events("/etc/sysconfig/memcached", qw( email-update sogo-modify bootstrap-console-save)); -templates2events("/etc/logrotate.d/sogo", qw( email-update sogo-modify bootstrap-console-save)); -templates2events("/etc/sysconfig/sogo", qw( email-update sogo-modify bootstrap-console-save)); -templates2events("/etc/rc.d/init.d/masq",qw( email-update sogo-modify)); -templates2events("/etc/cron.d/sogo",qw( email-update sogo-modify)); -templates2events("/etc/dovecot/master.users",qw( email-update sogo-modify)); -templates2events("/etc/dovecot/dovecot.conf",qw( sogo-modify)); -templates2events("/etc/sogo/sieve.creds",qw(sogo-modify post-install bootstrap-console-save)); +templates2events("/etc/e-smith/sql/init/30sogo_mysql_create_database", qw(sogo-modify smeserver-sogo-update post-install bootstrap-console-save)); +templates2events("/etc/e-smith/sql/init/31sogo_mysql_update_privileges", qw(sogo-modify smeserver-sogo-update post-install bootstrap-console-save)); +templates2events("/etc/e-smith/sql/init/31sogo_upgrade", qw(sogo-modify smeserver-sogo-update post-install post-upgrade)); +templates2events("/etc/e-smith/sql/init/32sogo_upgrade_2.3", qw(sogo-modify smeserver-sogo-update post-install post-upgrade)); + +templates2events("/var/lib/sogo/smeserver/sogo_mysql_update_privileges.sql", qw(sogo-modify smeserver-sogo-update post-install bootstrap-console-save)); + +templates2events("/var/service/tinydns/root/data", qw( email-update sogo-modify smeserver-sogo-update)); +templates2events("/etc/httpd/conf/httpd.conf", qw( email-update sogo-modify smeserver-sogo-update)); +templates2events("/etc/sogo/sogo.conf", qw( email-update sogo-modify smeserver-sogo-update bootstrap-console-save)); +templates2events("/etc/sysconfig/memcached", qw( email-update sogo-modify smeserver-sogo-update bootstrap-console-save)); +templates2events("/etc/logrotate.d/sogo", qw( email-update sogo-modify smeserver-sogo-update bootstrap-console-save)); +templates2events("/etc/sysconfig/sogo", qw( email-update sogo-modify smeserver-sogo-update bootstrap-console-save)); +templates2events("/etc/rc.d/init.d/masq",qw( email-update sogo-modify smeserver-sogo-update)); +templates2events("/etc/cron.d/sogo",qw( email-update sogo-modify smeserver-sogo-update)); +templates2events("/etc/dovecot/master.users",qw( email-update sogo-modify smeserver-sogo-update)); +templates2events("/etc/dovecot/dovecot.conf",qw( sogo-modify smeserver-sogo-update)); +templates2events("/etc/sogo/sieve.creds",qw(sogo-modify smeserver-sogo-update post-install bootstrap-console-save)); safe_symlink("sigusr1", "root/etc/e-smith/events/sogo-modify/services2adjust/httpd-e-smith"); safe_symlink("restart", "root/etc/e-smith/events/sogo-modify/services2adjust/sogod"); @@ -32,6 +38,14 @@ safe_symlink("restart", "root/etc/e-smith/events/sogo-modify/services2adjust/tinydns"); safe_symlink("start", "root/etc/e-smith/events/sogo-modify/services2adjust/mysql.init"); +safe_symlink("sigusr1", "root/etc/e-smith/events/smeserver-sogo-update/services2adjust/httpd-e-smith"); +safe_symlink("restart", "root/etc/e-smith/events/smeserver-sogo-update/services2adjust/sogod"); +safe_symlink("restart", "root/etc/e-smith/events/smeserver-sogo-update/services2adjust/dovecot"); +safe_symlink("restart", "root/etc/e-smith/events/smeserver-sogo-update/services2adjust/memcached"); +safe_symlink("adjust", "root/etc/e-smith/events/smeserver-sogo-update/services2adjust/masq"); +safe_symlink("restart", "root/etc/e-smith/events/smeserver-sogo-update/services2adjust/tinydns"); +safe_symlink("start", "root/etc/e-smith/events/smeserver-sogo-update/services2adjust/mysql.init"); + for my $event (qw(pre-backup)) { diff -urN smeserver-sogo-1.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess smeserver-sogo-1.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess --- smeserver-sogo-1.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess 2017-04-28 13:32:32.000000000 +0100 +++ smeserver-sogo-1.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess 2023-01-09 11:09:24.713009655 +0000 @@ -29,9 +29,10 @@ } - order deny,allow - deny from all - allow from all +# order deny,allow +# deny from all +# allow from all + Require all granted SSLRequireSSL on AddDefaultCharset UTF-8 RequestHeader set "x-webobjects-server-url" "https://%\{REQUEST_HOST\}e/SOGo" @@ -64,7 +65,8 @@ AllowOverride None Options +ExecCGI -Includes - Order allow,deny - Allow from all +# Order allow,deny +# Allow from all + Require all granted diff -urN smeserver-sogo-1.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAppleWorkArround smeserver-sogo-1.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAppleWorkArround --- smeserver-sogo-1.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAppleWorkArround 2017-04-28 13:32:32.000000000 +0100 +++ smeserver-sogo-1.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAppleWorkArround 2023-01-09 11:09:41.837044533 +0000 @@ -29,8 +29,9 @@ RequestHeader set "x-webobjects-server-protocol" "HTTP/1.0" RequestHeader set "x-webobjects-remote-host" "127.0.0.1" AddDefaultCharset UTF-8 - Order allow,deny - Allow from all +# Order allow,deny +# Allow from all + Require all granted diff -urN smeserver-sogo-1.6.old/root/usr/lib/systemd/system/sogod.service.d/50koozali.conf smeserver-sogo-1.6/root/usr/lib/systemd/system/sogod.service.d/50koozali.conf --- smeserver-sogo-1.6.old/root/usr/lib/systemd/system/sogod.service.d/50koozali.conf 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-sogo-1.6/root/usr/lib/systemd/system/sogod.service.d/50koozali.conf 2023-01-09 12:19:42.971711279 +0000 @@ -0,0 +1,6 @@ +[Unit] +After=wan.service +After=networking.service +[Install] +WantedBy=sme-server.target +