diff --git a/DEBIAN_COMPLIANCE b/DEBIAN_COMPLIANCE index 37230792..d0b5c334 100644 --- a/DEBIAN_COMPLIANCE +++ b/DEBIAN_COMPLIANCE @@ -11,8 +11,6 @@ launching : in a debian server could help finding the right way to do it (eg: bind9 ) ;) Questions: - - there is /var/alternc/cgi-bin/ . Should we forget it and use /usr/lib/cgi-bin/ ? If we must have - a specific directory, /var/lib/cgi-bin-alternc ? - what do we do about /var/alternc/exec.usr/ ? - we don't need our own php session folder don't we ? (or maybe for alternc-panel writable only ?) @@ -53,6 +51,7 @@ Should be fixed, need more test: - the bind zones, apache vhosts and other dynamic data are in /var/alternc/(bind|apache-vhost)/ => move them to /var/lib/alternc/(samename) - /var/alternc/db => not used anymore, drop - /var/alternc/mla => not used anymore, drop +- there is /var/alternc/cgi-bin/ is forgotten and now we use the standard /usr/lib/cgi-bin/ ******************************************************************************** FIXED: diff --git a/awstats/alterncawstats.conf b/awstats/alterncawstats.conf index ef532dc4..3896b05d 100644 --- a/awstats/alterncawstats.conf +++ b/awstats/alterncawstats.conf @@ -5,17 +5,6 @@ alias /awstats-icon/ /usr/share/awstats/icon/ Allow from all - - AuthUserFile /etc/alternc/awstats.htpasswd - AuthName "Protected Statistics for AlternC" - AuthType Basic - - - require valid-user - - - - AuthUserFile /etc/alternc/awstats.htpasswd AuthName "Protected Statistics for AlternC" diff --git a/debian/alternc-awstats.postinst b/debian/alternc-awstats.postinst index 1d3bab1e..d8149b48 100755 --- a/debian/alternc-awstats.postinst +++ b/debian/alternc-awstats.postinst @@ -54,11 +54,6 @@ EOF fi fi - if [ ! -h /var/alternc/cgi-bin/awstats.pl ]; then - ln -sf /usr/lib/cgi-bin/awstats.pl \ - /var/alternc/cgi-bin/awstats.pl - fi - logrotate_apache # Add htpasswd : diff --git a/debian/alternc.dirs b/debian/alternc.dirs index f921fbc9..fc4275fa 100644 --- a/debian/alternc.dirs +++ b/debian/alternc.dirs @@ -17,7 +17,6 @@ usr/lib/alternc/install.d usr/sbin usr/share/alternc/install usr/share/locale/fr/LC_MESSAGES -var/alternc/cgi-bin var/alternc/exec.usr var/alternc/tmp var/backups/alternc diff --git a/etc/alternc/templates/alternc/apache2.conf b/etc/alternc/templates/alternc/apache2.conf index ddbdd181..ab2b3b63 100644 --- a/etc/alternc/templates/alternc/apache2.conf +++ b/etc/alternc/templates/alternc/apache2.conf @@ -4,8 +4,6 @@ # Define the default user and group for mpm-itk AssignUserId www-data www-data -ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/ - # Deny access to the root filesystem Options FollowSymLinks @@ -15,14 +13,15 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/ #### End security parameters - - Options FollowSymLinks IncludesNOEXEC ExecCGI - AllowOverride None - Order allow,deny - Allow from all - AddHandler cgi-script .cgi +ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ + + AllowOverride None + Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch + Order allow,deny + Allow from all + Order allow,deny Allow from all @@ -69,5 +68,5 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/ Include /etc/alternc/bureau.conf - +# Now we include all the generated configuration Include /var/lib/alternc/apache-vhost/vhosts_all.conf