Changeset 1020

Timestamp:

04/25/06 07:09:10 (7 years ago)

Author:

anarcat

Message:

symlink our apache configs in postinst and remove them on postrm

remove the now duplicate configuration from our httpd.conf
templates. this doesn't fix the original bug (see #562) because we
still overwrite the config to avoid conflicting configurations.

this makes 0.9.5 a obligatory migration stop for upgrade paths.

Location:

trunk

Files:

• debian/postinst (modified) (1 diff)
• debian/postrm (modified) (1 diff)
• etc/alternc/templates/apache-ssl/httpd.conf (modified) (1 diff)
• etc/alternc/templates/apache/httpd.conf (modified) (2 diffs)

trunk/debian/postinst

@@ -155 +155 @@
     alternc.install
 
+    if [ ! -h /etc/apache/conf.d/alternc-ssl.conf ]; then
+        ln -sf /etc/apache/conf.d/alternc-ssl.conf \
+            /etc/apache/conf.d/alternc-ssl.conf
+    fi
+
+    if [ ! -h /etc/apache/conf.d/alternc.conf ]; then
+        ln -sf /etc/apache/conf.d/alternc.conf \
+            /etc/apache/conf.d/alternc.conf
+    fi
+
     ;;
 

trunk/debian/postrm

@@ -24 +24 @@
     ;;
   remove|upgrade|failed-upgrade|abort-install|abort-upgrade)
-    rm -f /etc/apache/conf.d/override.php.conf
+    rm -f /etc/apache/conf.d/override.php.conf /etc/apache/conf.d/alternc-ssl.conf /etc/apache/conf.d/alternc.conf
     ;;
   disappear)

trunk/etc/alternc/templates/apache-ssl/httpd.conf

@@ -261 +261 @@
 DirectoryIndex index.html index.htm index.shtml index.php3 index.php4 index.phtml index.php
 
-<VirtualHost *:443>
-        SSLEnable
-        DocumentRoot /var/alternc/bureau
-        alias /admin/sql        /usr/share/phpmyadmin
-        alias /webmail          /usr/share/squirrelmail
-        Alias /icons/ /usr/share/apache/icons/
-#       ***ALTERNC_ALIASES***
-
-</VirtualHost>
-
 Include /etc/apache-ssl/conf.d/[^.#]*
-
-<Directory /var/alternc>
-        php_admin_value disable_functions chmod,chown,chgrp,link,symlink
-        AllowOverride AuthConfig FileInfo
-        Options Indexes Includes FollowSymLinks MultiViews
-        Order allow,deny
-        Allow from all
-</Directory>
-<Directory /var/alternc/bureau>
-        php_admin_flag safe_mode_gid off
-        php_admin_flag safe_mode off
-</Directory>
-<Directory /var/alternc/dns/%%fqdn_lettre%%/%%fqdn%%>
-        php_admin_flag safe_mode_gid off
-        php_admin_flag safe_mode off
-</Directory>
-

trunk/etc/alternc/templates/apache/httpd.conf

@@ -41 +41 @@
 #
 # Please keep this LoadModule: line here, it is needed for installation.
-LoadModule vhost_alias_module /usr/lib/apache/1.3/mod_vhost_alias.so
+#LoadModule vhost_alias_module /usr/lib/apache/1.3/mod_vhost_alias.so
 LoadModule config_log_module /usr/lib/apache/1.3/mod_log_config.so
 LoadModule mime_module /usr/lib/apache/1.3/mod_mime.so
@@ -239 +239 @@
 </IfModule>
 
-<Location /server-status>
-    SetHandler server-status
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1 
-    Allow from %%monitor_ip%%
-</Location>
-
 DirectoryIndex index.html index.htm index.shtml index.php3 index.php4 index.phtml index.php
 
-<VirtualHost *:80>
-# ***ALTERNC_ALIASES***
-        alias /admin/sql        /usr/share/phpmyadmin
-        alias /webmail          /usr/share/squirrelmail
-        Alias /icons/ /usr/share/apache/icons/
-
-        UseCanonicalName    Off
-        VirtualDocumentRoot /var/alternc/dns/%-2.1/%0
-</VirtualHost>
-
 Include /etc/apache/conf.d/[^.#]*
-
-<Directory /var/alternc>
-        php_admin_value disable_functions chmod,chown,chgrp,link,symlink
-        AllowOverride AuthConfig FileInfo Limit Indexes 
-        Options Indexes Includes FollowSymLinks MultiViews
-        Order allow,deny
-        Allow from all
-</Directory>
-<Directory /var/alternc/bureau>
-        php_admin_flag safe_mode_gid off
-        php_admin_flag safe_mode off
-</Directory>
-<Directory /var/alternc/dns/%%fqdn_lettre%%/%%fqdn%%>
-        php_admin_flag safe_mode_gid off
-        php_admin_flag safe_mode off
-</Directory>
-
-
-