Merge pull request #51 from LDAPAccountManager/apache2.2-removal

drop Apache 2.2 support

lam-packaging/RPM/lam.apache.conf

@@ -4,13 +4,7 @@ Alias /lam /usr/share/ldap-account-manager
 <Directory /usr/share/ldap-account-manager>
   Options +FollowSymLinks
   AllowOverride All
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Allow from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all granted
-  </IfModule>
   DirectoryIndex index.html
 </Directory>
 
@@ -20,67 +14,31 @@ Alias /lam /usr/share/ldap-account-manager
 
 <Directory /var/lib/ldap-account-manager/tmp/internal>
   Options -Indexes
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Directory>
 
 <Directory /var/lib/ldap-account-manager/sess>
   Options -Indexes
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Directory>
 
 <Directory /var/lib/ldap-account-manager/config>
   Options -Indexes
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/lib>
   Options -Indexes
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/help>
   Options -Indexes
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/locale>
   Options -Indexes
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Directory>
 

lam-packaging/debian/control

@@ -13,7 +13,7 @@ Depends: php5 (>= 5.4.26) | php (>= 7), php5-ldap | php-ldap, php5-gd | php-gd,
  php5 | php-zip, php5 | php-xml, php5-imagick | php-imagick,
  libapache2-mod-php5 | libapache2-mod-php | php5-fpm | php-fpm,
  php-tcpdf, php-phpseclib (>= 2.0),
- apache2 | httpd, fonts-dejavu, debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends}
+ apache2 (>= 2.4.0) | httpd, fonts-dejavu, debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends}
 Recommends: php-apc | php-opcache
 Suggests: ldap-server, php5-mcrypt | php-mcrypt, ldap-account-manager-lamdaemon, perl
 Description: webfrontend for managing accounts in an LDAP directory

lam-packaging/debian/lam.apache.conf

@@ -4,13 +4,7 @@ Alias /lam /usr/share/ldap-account-manager
 <Directory /usr/share/ldap-account-manager>
   Options +FollowSymLinks
   AllowOverride All
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Allow from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all granted
-  </IfModule>
   DirectoryIndex index.html
 </Directory>
 
@@ -20,67 +14,31 @@ Alias /lam /usr/share/ldap-account-manager
 
 <Directory /var/lib/ldap-account-manager/tmp/internal>
   Options -Indexes
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Directory>
 
 <Directory /var/lib/ldap-account-manager/sess>
   Options -Indexes
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Directory>
 
 <Directory /var/lib/ldap-account-manager/config>
   Options -Indexes
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/lib>
   Options -Indexes
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/help>
   Options -Indexes
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/locale>
   Options -Indexes
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Directory>
 

lam/.htaccess

@@ -1,11 +1,5 @@
 <Files *>
   Options +FollowSymLinks
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Allow from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all granted
-  </IfModule>
   DirectoryIndex index.html
 </Files>

lam/HISTORY

@@ -1,5 +1,6 @@
 September 2018 6.5
   - Password change possible via LDAP EXOP operation (set LDAP_EXOP as password hash)
+  - Dropped suppurt for Apache 2.2
   - Upload: allow to overwrite existing accounts
   - Kolab updates
   - LAM Pro:

lam/config/.htaccess

@@ -1,9 +1,3 @@
 <Files *>
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Files>

lam/docs/manual-sources/appendix-security.xml

@@ -333,8 +333,7 @@ semodule -i httpdlocal.pp</programlisting>
         CustomLog /var/log/apache2/lam-proxy-access.log combined
         DocumentRoot /var/www/lam-proxy
         &lt;Proxy *&gt;
-            Order deny,allow
+            Require all granted
-            Allow from all
         &lt;/Proxy&gt;
         SSLProxyEngine on
         SSLEngine on

lam/docs/manual-sources/appendix-selfResetSchema.xml

@@ -13,8 +13,8 @@
 
     <para><emphasis role="bold">Schema installation</emphasis></para>
 
-      <para>Please install the schema that comes with LAM Pro. The schema
+    <para>Please install the schema that comes with LAM Pro. The schema files
-      files are located in:</para>
+    are located in:</para>
 
     <itemizedlist>
       <listitem>
@@ -26,8 +26,7 @@
       </listitem>
 
       <listitem>
-          <para>RPM:
+        <para>RPM: /usr/share/doc/ldap-account-manager-{VERSION}/schema</para>
-          /usr/share/doc/ldap-account-manager-{VERSION}/schema</para>
       </listitem>
     </itemizedlist>
 
@@ -51,12 +50,13 @@
     <para>For slapd.d configurations you need to upload the schema file
     passwordSelfReset.ldif via ldapadd command:</para>
 
-      <para>ldapadd -x -W -H ldap://localhost -D "cn=admin,o=test,c=de" -f
+    <para>ldapadd -x -W -H ldap://<emphasis>localhost</emphasis> -D
+    "<emphasis>cn=admin,o=test,c=de</emphasis>" -f
     passwordSelfReset.ldif</para>
 
-      <para>Please replace "localhost" with your LDAP server and
+    <para>Please replace "<emphasis>localhost</emphasis>" with your LDAP
-      "cn=admin,o=test,c=de" with your LDAP admin user (usually starts with
+    server and "<emphasis>cn=admin,o=test,c=de</emphasis>" with your LDAP
-      cn=admin or cn=manager).</para>
+    admin user (usually starts with cn=admin or cn=manager).</para>
 
     <literallayout>
 </literallayout>
@@ -191,10 +191,9 @@
 
     <para><emphasis role="bold">Samba 4</emphasis></para>
 
-      <para>Install the these update files by following the install
+    <para>Install the these update files by following the install instructions
-      instructions in the file. In case you you upgrade with a version
+    in the file. In case you you upgrade with a version difference of 2 or
-      difference of 2 or more you will need to apply all intermediate update
+    more you will need to apply all intermediate update scripts.</para>
-      scripts.</para>
 
     <itemizedlist>
       <listitem>
@@ -218,8 +217,7 @@
       </listitem>
     </itemizedlist>
 
-      <para>Please note that attributes file needs to be installed
+    <para>Please note that attributes file needs to be installed first.</para>
-      first.</para>
 
     <literallayout>
 </literallayout>
@@ -232,8 +230,7 @@
 
     <itemizedlist>
       <listitem>
-          <para>windows_version_1_to_2.ldif (upgrade from version 1
+        <para>windows_version_1_to_2.ldif (upgrade from version 1 only)</para>
-          only)</para>
       </listitem>
 
       <listitem>
@@ -242,4 +239,3 @@
     </itemizedlist>
   </section>
 </appendix>
- 

lam/help/.htaccess

@@ -1,9 +1,3 @@
 <Files *>
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Files>

lam/lib/.htaccess

@@ -1,9 +1,3 @@
 <Files *>
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Files>

lam/locale/.htaccess

@@ -1,9 +1,3 @@
 <Files *>
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Files>

lam/sess/.htaccess

@@ -1,9 +1,3 @@
 <Files *>
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Files>

lam/tmp/internal/.htaccess

@@ -1,9 +1,3 @@
 <Files *>
-  <IfModule !mod_authz_core.c>
-    Order allow,deny
-    Deny from all
-  </IfModule>
-  <IfModule mod_authz_core.c>
   Require all denied
-  </IfModule>
 </Files>