Commit 596c9e14 authored by anarcat's avatar anarcat Committed by anarcat

make a more neutral and generic apache.d config directory

this allows administrators to share arbitrary configurations for multiple aegir backend nodes sharing /var/aegir over a network filesystem

the new directory is in ~/config/apache.d/ and included from apache.conf automatically
parent c47f9f96
......@@ -171,5 +171,10 @@ To read :
Include /var/aegir/config/apache.conf
You will also need to create the following directories :
/var/aegir/config/platform.d
/var/aegir/config/apache.d
Now log into Aegir, and verify the hostmaster platform. This will generate
the correct apache.conf file and restart apache.
......@@ -139,6 +139,7 @@ fi
msg "Creating basic directory structure"
mkdir -p $AEGIR_HOME/config/vhost.d
mkdir -p $AEGIR_HOME/config/platform.d
mkdir -p $AEGIR_HOME/config/apache.d
mkdir -p $AEGIR_HOME/backups
chmod 0711 $AEGIR_HOME/config
chmod 0700 $AEGIR_HOME/backups
......@@ -207,8 +208,12 @@ NameVirtualHost *:80
LoadModule rewrite_module modules/mod_rewrite.so
</IfModule>
# virtual hosts
Include $AEGIR_HOME/config/vhost.d/
# platforms
Include $AEGIR_HOME/config/platform.d/
# other configuration, not touched by aegir
Include $AEGIR_HOME/config/apache.d/
EOF
fi
......
......@@ -22,7 +22,12 @@ endif;
LoadModule rewrite_module modules/mod_rewrite.so
</IfModule>
# virtual hosts
Include <?php print $config_path ?>/vhost.d/
# platforms
Include <?php print $config_path ?>/platform.d/
# other configuration, not touched by aegir
Include <?php print $config_path ?>/apache.d/
<?php print $extra_config; ?>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment