Commit a4c15654 authored by anarcat's avatar anarcat Committed by anarcat
Browse files

properly resolve merge of install.txt

parent 7dd18a41
......@@ -35,7 +35,8 @@ AEGIR_VERSION=HEAD
AEGIR_HOME=$HOME
WEB_GROUP=www-data
# doesn't exist yet, but we need drush_prompt in HEAD
DRUSH_VERSION=All-versions-3.0-rc3
DRUSH_VERSION=6.x-3.0-rc3
DRUSH_MAKE_VERSION=6.x-2.0-beta6
# when adding a variable here, add it to the display below
......@@ -190,37 +191,8 @@ else
fi
fi
<<<<<<< HEAD
# this will prompt the user for the database password if not provided through stdin in JSON
$DRUSH provision-server --parent_path=$AEGIR_HOME --web_group=$WEB_GROUP --drush_path=$DRUSH
=======
# this should be handled by provision server verification, as it is a
# duplicate of web_server/provision_apache_server.tpl.php
# http://drupal.org/node/586000
if [ ! -f $AEGIR_HOME/config/apache.conf ]; then
cat > $AEGIR_HOME/config/apache.conf <<EOF
NameVirtualHost *:80
<IfModule ssl_module>
NameVirtualHost *:443
</IfModule>
<IfModule !env_module>
LoadModule env_module modules/mod_env.so
</IfModule>
<IfModule !rewrite_module>
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
>>>>>>> master
msg "Aegir provision backend installed successfully"
......
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