Description: move /opt/web2ldap to /usr/share/web2ldap
Origin: vendor
--- a/etc/httpd/sample-mod_fastcgi.conf
+++ b/etc/httpd/sample-mod_fastcgi.conf
@@ -12,18 +12,18 @@
 #LoadModule fastcgi_module /usr/lib/apache/mod_fastcgi.so
 #AddModule mod_fastcgi.c
 
-ScriptAlias /web2ldap /opt/web2ldap/fcgi/web2ldap.py
-Alias /web2ldap-doc /opt/web2ldap/htdocs
-Alias /css/web2ldap /opt/web2ldap/htdocs/css/web2ldap
+ScriptAlias /web2ldap /usr/share/web2ldap/fcgi/web2ldap.py
+Alias /web2ldap-doc /usr/share/web2ldap/htdocs
+Alias /css/web2ldap /usr/share/web2ldap/htdocs/css/web2ldap
 
 # Force use of a pseudo-random salt to make hash() values in Python
 SetEnv PYTHONHASHSEED random
 
 # Using TCP connection
-#FastCgiServer /opt/web2ldap/fcgi/web2ldap.py -port 11760 -idle-timeout 600 -appConnTimeout 0
+#FastCgiServer /usr/share/web2ldap/fcgi/web2ldap.py -port 11760 -idle-timeout 600 -appConnTimeout 0
 
 # Using Unix domain socket
-FastCgiServer /opt/web2ldap/fcgi/web2ldap.py -socket /var/lib/apache2/web2ldap-fcgi-socket -processes 1 -idle-timeout 600 -appConnTimeout 0
+FastCgiServer /usr/share/web2ldap/fcgi/web2ldap.py -socket /var/lib/apache2/web2ldap-fcgi-socket -processes 1 -idle-timeout 600 -appConnTimeout 0
 
 <Location /web2ldap>
   # Tell mod_ssl to set the SSL standard env vars
@@ -36,7 +36,7 @@ FastCgiServer /opt/web2ldap/fcgi/web2lda
   </Limit>
 </Location>
 
-<Directory /opt/web2ldap/htdocs>
+<Directory /usr/share/web2ldap/htdocs>
   DirectoryIndex web2ldap.html
   <Limit>
      Order allow,deny
--- a/etc/httpd/sample-mod_fcgid.conf
+++ b/etc/httpd/sample-mod_fcgid.conf
@@ -8,15 +8,21 @@
 # http://httpd.apache.org/mod_fcgid/
 ########################################################################
 
+# It should look like this:
+#Alias /yourapplication /usr/share/yourapplication
+#<Directory /usr/share/yourapplication>
+#..
+#</Directory>
+
 # Load and install module mod_fcgid
 #LoadModule fcgid_module /usr/lib64/apache2/mod_fcgid.so
 
 #SocketPath /var/lib/apache2/fcgid
 #SharememPath /var/run/fcgid_shm
 
-ScriptAlias /web2ldap /opt/web2ldap/fcgi/web2ldap.py
-Alias /web2ldap-doc /opt/web2ldap/htdocs
-Alias /css/web2ldap /opt/web2ldap/htdocs/css/web2ldap
+ScriptAlias /web2ldap /usr/share/web2ldap/fcgi/web2ldap.py
+Alias /web2ldap-doc /usr/share/web2ldap/htdocs
+Alias /css/web2ldap /usr/share/web2ldap/htdocs/css/web2ldap
 
 # Force use of a pseudo-random salt to make hash() values
 # in Python 2.6.8+ and Python 2.7.3+ to avoid DoS attacks
@@ -39,17 +45,28 @@ IPCCommTimeout 600
     SSLOptions +StdEnvVars
   </IfDefine>
   <Limit GET POST>
-     Order allow,deny
-     Allow from 127.0.0.1
-     Allow from ::1
+     <IfVersion >= 2.4>
+       Require local
+     </IfVersion>
+     <IfVersion < 2.4>
+       # This will trigger Lintian (#710656, override in place)
+       Order allow,deny
+       Allow from 127.0.0.1
+       Allow from ::1
+     </IfVersion>
   </Limit>
 </Location>
 
-<Directory /opt/web2ldap/htdocs>
+<Directory /usr/share/web2ldap/htdocs>
   DirectoryIndex web2ldap.html
   <Limit GET>
-     Order allow,deny
-     Allow from All
+     <IfVersion >= 2.4>
+       Require all granted
+     </IfVersion>
+     <IfVersion < 2.4>
+       Order allow,deny
+       Allow from All
+     </IfVersion>
   </Limit>
 </Directory>
 
