/[smecontribs]/rpms/smeserver-wordpress/contribs9/smeserver-wordpress-1.2.NfrHttpdDirective.patch
ViewVC logotype

Contents of /rpms/smeserver-wordpress/contribs9/smeserver-wordpress-1.2.NfrHttpdDirective.patch

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

Revision 1.1 - (show annotations) (download)
Wed Nov 18 14:26:52 2015 UTC (8 years, 5 months ago) by stephdl
Branch: MAIN
CVS Tags: smeserver-wordpress-1_2-9_el6_sme, HEAD 
* Wed Nov 18 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.2-9.sme
- Added new directive to apache (Indexes, FollowSymLinks, AllowOverrideAll)
- The http can be forced, even if it is not a good idea
- new properties in the wordpress key
1 diff -Nur smeserver-wordpress-1.2.NfrHttpdDirective.old/root/etc/e-smith/db/configuration/defaults/wordpress/AllowOverrideAll smeserver-wordpress-1.2.NfrHttpdDirective.new/root/etc/e-smith/db/configuration/defaults/wordpress/AllowOverrideAll
2 --- smeserver-wordpress-1.2.NfrHttpdDirective.old/root/etc/e-smith/db/configuration/defaults/wordpress/AllowOverrideAll 1970-01-01 01:00:00.000000000 +0100
3 +++ smeserver-wordpress-1.2.NfrHttpdDirective.new/root/etc/e-smith/db/configuration/defaults/wordpress/AllowOverrideAll 2015-11-18 14:34:49.008888523 +0100
4 @@ -0,0 +1 @@
5 +disabled
6 diff -Nur smeserver-wordpress-1.2.NfrHttpdDirective.old/root/etc/e-smith/db/configuration/defaults/wordpress/Https smeserver-wordpress-1.2.NfrHttpdDirective.new/root/etc/e-smith/db/configuration/defaults/wordpress/Https
7 --- smeserver-wordpress-1.2.NfrHttpdDirective.old/root/etc/e-smith/db/configuration/defaults/wordpress/Https 1970-01-01 01:00:00.000000000 +0100
8 +++ smeserver-wordpress-1.2.NfrHttpdDirective.new/root/etc/e-smith/db/configuration/defaults/wordpress/Https 2015-11-18 14:51:46.733746836 +0100
9 @@ -0,0 +1 @@
10 +enabled
11 diff -Nur smeserver-wordpress-1.2.NfrHttpdDirective.old/root/etc/e-smith/db/configuration/defaults/wordpress/Indexes smeserver-wordpress-1.2.NfrHttpdDirective.new/root/etc/e-smith/db/configuration/defaults/wordpress/Indexes
12 --- smeserver-wordpress-1.2.NfrHttpdDirective.old/root/etc/e-smith/db/configuration/defaults/wordpress/Indexes 1970-01-01 01:00:00.000000000 +0100
13 +++ smeserver-wordpress-1.2.NfrHttpdDirective.new/root/etc/e-smith/db/configuration/defaults/wordpress/Indexes 2015-11-18 14:33:58.992216024 +0100
14 @@ -0,0 +1 @@
15 +disabled
16 diff -Nur smeserver-wordpress-1.2.NfrHttpdDirective.old/root/etc/e-smith/db/configuration/defaults/wordpress/SymLinks smeserver-wordpress-1.2.NfrHttpdDirective.new/root/etc/e-smith/db/configuration/defaults/wordpress/SymLinks
17 --- smeserver-wordpress-1.2.NfrHttpdDirective.old/root/etc/e-smith/db/configuration/defaults/wordpress/SymLinks 1970-01-01 01:00:00.000000000 +0100
18 +++ smeserver-wordpress-1.2.NfrHttpdDirective.new/root/etc/e-smith/db/configuration/defaults/wordpress/SymLinks 2015-11-18 14:33:37.533640385 +0100
19 @@ -0,0 +1 @@
20 +disabled
21 diff -Nur smeserver-wordpress-1.2.NfrHttpdDirective.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress smeserver-wordpress-1.2.NfrHttpdDirective.new/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress
22 --- smeserver-wordpress-1.2.NfrHttpdDirective.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress 2015-11-16 21:09:25.149054143 +0100
23 +++ smeserver-wordpress-1.2.NfrHttpdDirective.new/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress 2015-11-18 14:48:29.030176746 +0100
24 @@ -53,19 +53,25 @@
25 $OUT .= "# wordpress - $name\n";
26 $OUT .= "#------------------------------------------------------------\n";
27
28 - {
29 - if (exists $wordpress{'URL'})
30 - { $OUT .= "Alias /$wordpress{'URL'} /usr/share/wordpress\n"; }
31 - }
32 -
33 - $OUT .= "Alias /wordpress /usr/share/wordpress\n";
34
35 + if (exists $wordpress{'URL'}) {
36 + $OUT .= "Alias /$wordpress{'URL'} /usr/share/wordpress\n";
37 + }
38 +
39 + else {
40 + $OUT .= "Alias /wordpress /usr/share/wordpress\n";
41 + }
42 +
43 $OUT .= "\n";
44 $OUT .= "<Directory /usr/share/wordpress>\n";
45 $OUT .= " AddType application/x-httpd-php .php\n";
46 $OUT .= " php_admin_value open_basedir /usr/share/wordpress:/etc/wordpress:/tmp/:/usr/share/pear:/usr/share/php/\n";
47 - $OUT .= " Options None\n";
48 - $OUT .= " order deny,allow\n";
49 + $OUT .= " Options ";
50 + $OUT .= " FollowSymLinks " if ( ($wordpress{'SymLinks'} || 'disabled') eq 'enabled');
51 + $OUT .= " Indexes " if ( ($wordpress{'Indexes'} || 'disabled') eq 'enabled');
52 + $OUT .= " None " if ((($wordpress{'Indexes'} || 'disabled') ne 'enabled') && (($wordpress{'SymLinks'} || 'disabled') ne 'enabled'));
53 + $OUT .= "\n AllowOverride All" if ( ($wordpress{'AllowOverrideAll'} || 'disabled') eq 'enabled');
54 + $OUT .= "\n order deny,allow\n";
55 $OUT .= " deny from all\n";
56 $OUT .= " allow from $allow\n";
57 $OUT .= " php_value mysql.default_host $wordpress{DbName}\n";
58 diff -Nur smeserver-wordpress-1.2.NfrHttpdDirective.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30wordpressAlias smeserver-wordpress-1.2.NfrHttpdDirective.new/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30wordpressAlias
59 --- smeserver-wordpress-1.2.NfrHttpdDirective.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30wordpressAlias 2015-11-16 21:09:25.149054143 +0100
60 +++ smeserver-wordpress-1.2.NfrHttpdDirective.new/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30wordpressAlias 2015-11-18 15:03:08.087914421 +0100
61 @@ -2,11 +2,17 @@
62 my $status = $wordpress{'status'} || "disabled";
63 return " # wordpress is disabled in this VirtualHost"
64 unless $status eq 'enabled';
65 + my $HTTPS = $wordpress{'Https'} || 'enabled';
66
67 - $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ? 'yes' : 'no';
68 - if (($port eq "80") && ($haveSSL eq 'yes'))
69 - {
70 - $OUT .= " RewriteRule ^/wordpress(/.*|\$) https://%{HTTP_HOST}/wordpress\$1 [L,R]\n";
71 - }
72 + $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ? 'yes' : 'no';
73 + if (($port eq "80") && ($haveSSL eq 'yes') && ($HTTPS eq 'enabled'))
74 + {
75 + if (exists $wordpress{'URL'}) {
76 + $OUT .= " RewriteRule ^/$wordpress{'URL'}(/.*|\$) https://%{HTTP_HOST}/$wordpress{'URL'}\$1 [L,R]\n";
77 + }
78 + else {
79 + $OUT .= " RewriteRule ^/wordpress(/.*|\$) https://%{HTTP_HOST}/wordpress\$1 [L,R]\n";
80 + }
81 + }
82 }
83
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed