/[smecontribs]/rpms/smeserver-phpmyadmin-multiuser/contribs7/smeserver-phpmyadmin-multiuser-2.11.3-Alias.patch
ViewVC logotype

Annotation of /rpms/smeserver-phpmyadmin-multiuser/contribs7/smeserver-phpmyadmin-multiuser-2.11.3-Alias.patch

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

Revision 1.3 - (hide annotations) (download)
Tue Nov 25 16:20:28 2008 UTC (16 years ago) by slords
Branch: MAIN
CVS Tags: HEAD
Changes since 1.2: +0 -0 lines 
Restore
1 snetram 1.1 --- smeserver-phpmyadmin-multiuser-2.11.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminMulti.Alias 2008-05-15 21:27:49.000000000 +0200
2     +++ smeserver-phpmyadmin-multiuser-2.11.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminMulti 2008-05-15 21:30:53.000000000 +0200
3     @@ -1,9 +1,8 @@
4     {
5     + $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ? 'yes' : 'no';
6    
7     - if ($port eq "80")
8     - {
9     - $OUT = ' RewriteRule ^/myadmin(/.*|$) https://%{HTTP_HOST}/myadmin$1 [L,R]';
10     - } else {
11     - $OUT = ' Alias /phpmyadmin /usr/share/phpmyadmin';
12     - }
13     + if (($port eq "80") && ($haveSSL eq 'yes'))
14     + {
15     + $OUT .= " RewriteRule ^/phpmyadmin(/.*|\$) https://%{HTTP_HOST}/phpmyadmin\$1 [L,R]\n";
16     + }
17     }
18     --- smeserver-phpmyadmin-multiuser-2.11.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminmultiAlias.Alias 2008-05-15 21:27:49.000000000 +0200
19     +++ smeserver-phpmyadmin-multiuser-2.11.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminmultiAlias 2008-05-15 21:30:05.000000000 +0200
20     @@ -1,5 +1,6 @@
21     +# phpMyAdmin
22     +Alias /phpmyadmin /usr/share/phpmyadmin
23    
24     -# Administration: phpMyAdmin
25     <Directory /usr/share/phpmyadmin>
26     SSLRequireSSL on
27     Options -Indexes
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed