Remove old apache2 config module

openxpki · Jun 17, 2020 · e5acf07 · e5acf07
1 parent 328823b
commit e5acf07
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/config b/config
diff --git a/package/debian/core/libopenxpki-perl.examples b/package/debian/core/libopenxpki-perl.examples
@@ -1,6 +1,5 @@
 examples/openxpki-etc.tgz
 examples/contrib/sampleconfig.sh
-examples/contrib/apache2-openxpki.conf
 examples/contrib/apache2-openxpki-site.conf
 examples/contrib/logrotate.conf
 examples/contrib/sql/schema-mysql.sql
diff --git a/package/debian/core/libopenxpki-perl.postinst b/package/debian/core/libopenxpki-perl.postinst
@@ -49,15 +49,11 @@ case "$1" in
                 chmod -R 750 /etc/openxpki/ca/
             fi
 
-            if [ -d /etc/apache2/conf-available/ ]; then
-                if [ ! -e /etc/apache2/conf-available/openxpki.conf ]; then
-                    cp /usr/share/doc/libopenxpki-perl/examples/apache2-openxpki.conf /etc/apache2/conf-available/openxpki.conf
-                    # Activate module, this creates the symlink in conf-available
-                    /usr/sbin/a2enconf openxpki
-                    /usr/sbin/a2enmod headers
-                fi;
+            if [ -d /etc/apache2/sites-available/ ]; then
                 if [ ! -e /etc/apache2/sites-available/openxpki.conf ]; then
                     cp /usr/share/doc/libopenxpki-perl/examples/apache2-openxpki-site.conf /etc/apache2/sites-available/openxpki.conf
+                    /usr/sbin/a2enmod headers
+                    /usr/sbin/a2ensite openxpki
                 fi;
             fi;