/[smecontribs]/rpms/smeserver-sogo/contribs10/smeserver-sogo-1.6-Update-to-SME10-Apache-2.4-and-systemd-dropin.patch
ViewVC logotype

Contents of /rpms/smeserver-sogo/contribs10/smeserver-sogo-1.6-Update-to-SME10-Apache-2.4-and-systemd-dropin.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Mon Jan 9 18:52:09 2023 UTC (21 months, 3 weeks ago) by brianr
Branch: MAIN
CVS Tags: smeserver-sogo-1_6-1_el7_sme, smeserver-sogo-1_6-2_el7_sme, smeserver-sogo-1_6-3_el7_sme, HEAD
Error occurred while calculating annotation data. 
* Sat Jan 07 2023 Brian Read <brianr@bjsystems.co.uk> - 1.6-1.sme
- Initial import to SME10 tree [SME: 11629]
- Changes to spec file to avoid clash between sogo rpm directories and this rpm.
- Update permissions to Apache 2.4
- Add systemd dropin
- Add -update event to createlinks
1 diff -urN smeserver-sogo-1.6.old/createlinks smeserver-sogo-1.6/createlinks
2 --- smeserver-sogo-1.6.old/createlinks 2017-04-28 13:32:32.000000000 +0100
3 +++ smeserver-sogo-1.6/createlinks 2023-01-09 17:28:58.566864500 +0000
4 @@ -2,27 +2,33 @@
5
6 use esmith::Build::CreateLinks qw(:all);
7
8 +#action needed in case we have a systemd unit
9 +$event = "smeserver-sogo-update";
10 +event_link("systemd-default", $event, "10");
11 +event_link("systemd-reload", $event, "50");
12 +
13 +
14 service_link_enhanced("memcached", "S55", "7");
15 service_link_enhanced("sogod", "S85", "7");
16
17 -templates2events("/etc/e-smith/sql/init/30sogo_mysql_create_database", qw(sogo-modify post-install bootstrap-console-save));
18 -templates2events("/etc/e-smith/sql/init/31sogo_mysql_update_privileges", qw(sogo-modify post-install bootstrap-console-save));
19 -templates2events("/etc/e-smith/sql/init/31sogo_upgrade", qw(sogo-modify post-install post-upgrade));
20 -templates2events("/etc/e-smith/sql/init/32sogo_upgrade_2.3", qw(sogo-modify post-install post-upgrade));
21 -
22 -templates2events("/var/lib/sogo/smeserver/sogo_mysql_update_privileges.sql", qw(sogo-modify post-install bootstrap-console-save));
23 -
24 -templates2events("/var/service/tinydns/root/data", qw( email-update sogo-modify));
25 -templates2events("/etc/httpd/conf/httpd.conf", qw( email-update sogo-modify));
26 -templates2events("/etc/sogo/sogo.conf", qw( email-update sogo-modify bootstrap-console-save));
27 -templates2events("/etc/sysconfig/memcached", qw( email-update sogo-modify bootstrap-console-save));
28 -templates2events("/etc/logrotate.d/sogo", qw( email-update sogo-modify bootstrap-console-save));
29 -templates2events("/etc/sysconfig/sogo", qw( email-update sogo-modify bootstrap-console-save));
30 -templates2events("/etc/rc.d/init.d/masq",qw( email-update sogo-modify));
31 -templates2events("/etc/cron.d/sogo",qw( email-update sogo-modify));
32 -templates2events("/etc/dovecot/master.users",qw( email-update sogo-modify));
33 -templates2events("/etc/dovecot/dovecot.conf",qw( sogo-modify));
34 -templates2events("/etc/sogo/sieve.creds",qw(sogo-modify post-install bootstrap-console-save));
35 +templates2events("/etc/e-smith/sql/init/30sogo_mysql_create_database", qw(sogo-modify smeserver-sogo-update post-install bootstrap-console-save));
36 +templates2events("/etc/e-smith/sql/init/31sogo_mysql_update_privileges", qw(sogo-modify smeserver-sogo-update post-install bootstrap-console-save));
37 +templates2events("/etc/e-smith/sql/init/31sogo_upgrade", qw(sogo-modify smeserver-sogo-update post-install post-upgrade));
38 +templates2events("/etc/e-smith/sql/init/32sogo_upgrade_2.3", qw(sogo-modify smeserver-sogo-update post-install post-upgrade));
39 +
40 +templates2events("/var/lib/sogo/smeserver/sogo_mysql_update_privileges.sql", qw(sogo-modify smeserver-sogo-update post-install bootstrap-console-save));
41 +
42 +templates2events("/var/service/tinydns/root/data", qw( email-update sogo-modify smeserver-sogo-update));
43 +templates2events("/etc/httpd/conf/httpd.conf", qw( email-update sogo-modify smeserver-sogo-update));
44 +templates2events("/etc/sogo/sogo.conf", qw( email-update sogo-modify smeserver-sogo-update bootstrap-console-save));
45 +templates2events("/etc/sysconfig/memcached", qw( email-update sogo-modify smeserver-sogo-update bootstrap-console-save));
46 +templates2events("/etc/logrotate.d/sogo", qw( email-update sogo-modify smeserver-sogo-update bootstrap-console-save));
47 +templates2events("/etc/sysconfig/sogo", qw( email-update sogo-modify smeserver-sogo-update bootstrap-console-save));
48 +templates2events("/etc/rc.d/init.d/masq",qw( email-update sogo-modify smeserver-sogo-update));
49 +templates2events("/etc/cron.d/sogo",qw( email-update sogo-modify smeserver-sogo-update));
50 +templates2events("/etc/dovecot/master.users",qw( email-update sogo-modify smeserver-sogo-update));
51 +templates2events("/etc/dovecot/dovecot.conf",qw( sogo-modify smeserver-sogo-update));
52 +templates2events("/etc/sogo/sieve.creds",qw(sogo-modify smeserver-sogo-update post-install bootstrap-console-save));
53
54 safe_symlink("sigusr1", "root/etc/e-smith/events/sogo-modify/services2adjust/httpd-e-smith");
55 safe_symlink("restart", "root/etc/e-smith/events/sogo-modify/services2adjust/sogod");
56 @@ -32,6 +38,14 @@
57 safe_symlink("restart", "root/etc/e-smith/events/sogo-modify/services2adjust/tinydns");
58 safe_symlink("start", "root/etc/e-smith/events/sogo-modify/services2adjust/mysql.init");
59
60 +safe_symlink("sigusr1", "root/etc/e-smith/events/smeserver-sogo-update/services2adjust/httpd-e-smith");
61 +safe_symlink("restart", "root/etc/e-smith/events/smeserver-sogo-update/services2adjust/sogod");
62 +safe_symlink("restart", "root/etc/e-smith/events/smeserver-sogo-update/services2adjust/dovecot");
63 +safe_symlink("restart", "root/etc/e-smith/events/smeserver-sogo-update/services2adjust/memcached");
64 +safe_symlink("adjust", "root/etc/e-smith/events/smeserver-sogo-update/services2adjust/masq");
65 +safe_symlink("restart", "root/etc/e-smith/events/smeserver-sogo-update/services2adjust/tinydns");
66 +safe_symlink("start", "root/etc/e-smith/events/smeserver-sogo-update/services2adjust/mysql.init");
67 +
68
69 for my $event (qw(pre-backup))
70 {
71 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
72 --- smeserver-sogo-1.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess 2017-04-28 13:32:32.000000000 +0100
73 +++ smeserver-sogo-1.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess 2023-01-09 11:09:24.713009655 +0000
74 @@ -29,9 +29,10 @@
75 }
76
77 <Location /SOGo>
78 - order deny,allow
79 - deny from all
80 - allow from all
81 +# order deny,allow
82 +# deny from all
83 +# allow from all
84 + Require all granted
85 SSLRequireSSL on
86 AddDefaultCharset UTF-8
87 RequestHeader set "x-webobjects-server-url" "https://%\{REQUEST_HOST\}e/SOGo"
88 @@ -64,7 +65,8 @@
89
90 AllowOverride None
91 Options +ExecCGI -Includes
92 - Order allow,deny
93 - Allow from all
94 +# Order allow,deny
95 +# Allow from all
96 + Require all granted
97 </Directory>
98
99 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
100 --- smeserver-sogo-1.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAppleWorkArround 2017-04-28 13:32:32.000000000 +0100
101 +++ smeserver-sogo-1.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAppleWorkArround 2023-01-09 11:09:41.837044533 +0000
102 @@ -29,8 +29,9 @@
103 RequestHeader set "x-webobjects-server-protocol" "HTTP/1.0"
104 RequestHeader set "x-webobjects-remote-host" "127.0.0.1"
105 AddDefaultCharset UTF-8
106 - Order allow,deny
107 - Allow from all
108 +# Order allow,deny
109 +# Allow from all
110 + Require all granted
111 </Proxy>
112 </VirtualHost>
113
114 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
115 --- smeserver-sogo-1.6.old/root/usr/lib/systemd/system/sogod.service.d/50koozali.conf 1970-01-01 01:00:00.000000000 +0100
116 +++ smeserver-sogo-1.6/root/usr/lib/systemd/system/sogod.service.d/50koozali.conf 2023-01-09 12:19:42.971711279 +0000
117 @@ -0,0 +1,6 @@
118 +[Unit]
119 +After=wan.service
120 +After=networking.service
121 +[Install]
122 +WantedBy=sme-server.target
123 +
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed