remove support for mod_perl before v2

diff --git a/Makefile b/Makefile
index 478bb26..d5576a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,13 +26,6 @@ MASONDATA = ${FREESIDE_CACHE}/masondata
 #package maintainers
 DIST_CONF = ${FREESIDE_CONF}/default_conf
 
 #package maintainers
 DIST_CONF = ${FREESIDE_CONF}/default_conf
 

-#mod_perl v1
-#APACHE_VERSION = 1
-#mod_perl v2 prereleases up to and including 1.999_21
-#APACHE_VERSON = 1.99
-#mod_perl v2 proper and prereleases 1.999_22 and after
-APACHE_VERSION = 2
-

 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #redhat, fedora, mandrake
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #redhat, fedora, mandrake


@@ -261,7 +254,7 @@ install-init:
 install-apache:
        [ -e ${APACHE_CONF}/freeside-base.conf ] && rm ${APACHE_CONF}/freeside-base.conf || true
        [ -d ${APACHE_CONF} ] && \
 install-apache:
        [ -e ${APACHE_CONF}/freeside-base.conf ] && rm ${APACHE_CONF}/freeside-base.conf || true
        [ -d ${APACHE_CONF} ] && \

-         ( install -o root -m 755 htetc/freeside-base${APACHE_VERSION}.conf ${APACHE_CONF} && \
+         ( install -o root -m 755 htetc/freeside-base2.conf ${APACHE_CONF} && \

            ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
            ( [ ${TORRUS_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-torrus.conf ${APACHE_CONF} || true ) && \
            perl -p -i -e "\
            ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
            ( [ ${TORRUS_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-torrus.conf ${APACHE_CONF} || true ) && \
            perl -p -i -e "\

diff --git a/htetc/freeside-base1.99.conf b/htetc/freeside-base1.99.conf
deleted file mode 100644 (file)
index f3f7676..0000000
--- a/htetc/freeside-base1.99.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-PerlModule Apache::compat
-
-#PerlModule Apache::DBI
-
-PerlModule HTML::Mason
-PerlSetVar MasonArgsMethod CGI
-PerlModule HTML::Mason::ApacheHandler
-
-PerlRequire "%%%MASON_HANDLER%%%"
-
-#Locale::SubCountry
-AddDefaultCharset ISO-8859-1
-
-<Directory %%%FREESIDE_DOCUMENT_ROOT%%%>
-AuthName Freeside
-AuthType Basic
-AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
-require valid-user
-<Files ~ "(\.cgi|\.html)$">
-SetHandler perl-script
-PerlHandler HTML::Mason
-</Files>
-</Directory>
-<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/Helpers/>
-SetHandler perl-script
-PerlHandler HTML::Mason
-</Directory>
-
-<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/loginout>
-AuthName Freeside
-AuthType Basic
-AuthUserFile %%%FREESIDE_CONF%%%/htpasswd.logout
-require valid-user
-<Files ~ "(\.cgi|\.html)$">
-SetHandler default-handler
-</Files>
-</Directory>
-

diff --git a/htetc/freeside-base1.conf b/htetc/freeside-base1.conf
deleted file mode 100644 (file)
index 16e1e14..0000000
--- a/htetc/freeside-base1.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-#PerlModule Apache::DBI
-
-PerlModule HTML::Mason
-
-#Locale::SubCountry
-AddDefaultCharset ISO-8859-1
-
-<Directory %%%FREESIDE_DOCUMENT_ROOT%%%>
-AuthName Freeside
-AuthType Basic
-AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
-require valid-user
-<Files ~ "(\.cgi|\.html)$">
-AddHandler perl-script .cgi .html
-PerlHandler HTML::Mason
-</Files>
-</Directory>
-<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/Helpers/>
-SetHandler perl-script
-PerlHandler HTML::Mason
-</Directory>
-<Perl>
-require "%%%MASON_HANDLER%%%";
-</Perl>
-
-<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/loginout>
-AuthName Freeside
-AuthType Basic
-AuthUserFile %%%FREESIDE_CONF%%%/htpasswd.logout
-require valid-user
-<Files ~ "(\.cgi|\.html)$">
-SetHandler default-handler
-</Files>
-</Directory>
-