Commit 350f9291 authored by anarcat's avatar anarcat

nginx support in the debian package

apache2 remains the default
parent cc6aeabc
......@@ -40,4 +40,38 @@ db_input low aegir/db_user || true
# root password, ask for it again
db_fset aegir/db_password "seen" "false" || true
db_input high aegir/db_password || true
# (taken from the webapps-common httpd functions)
# wc_httpd_installed: test for installed httpds
# usage:
# wc_httpd_installed [ httpd1 httpd2 ... ]
#
# no arguments implies to test for all servers
wc_httpd_installed(){
local httpds
if [ "$*" ]; then
httpds=$*
else
httpds=$wc_httpd_supported
fi
for f in $httpds; do
if test -x /usr/sbin/$f; then
echo $f
fi
done
}
# list of installed servers to check for
default_servers=`wc_httpd_installed apache2 nginx`
# convert list to comma seperated list
server_list=`echo $default_servers | sed -e 's/[[:space:]][[:space:]]*/, /g'`
# if they haven't already been prompted, preseed the server selection
db_fget aegir/webserver seen
if [ "$RET" = "false" ]; then
db_set aegir/webserver $server_list
fi
db_input low aegir/webserver || true
# alright, ask the questions that need to be asked
db_go
......@@ -41,6 +41,13 @@ case "$1" in
if [ ! -z "$RET" ]; then
FLAGS="$FLAGS --makefile='$RET'"
fi
db_get "aegir/webserver"
if [ ! -z "$RET" ]; then
if [ "$RET" = 'apache2' ]; then
RET='apache' # convert argument to something aegir can understand
fi
FLAGS="$FLAGS --http_service_type='$RET'"
fi
TEMPFILE=`tempfile`
su -s /bin/sh aegir -c 'drush --pipe @hostmaster status | egrep "site_uri|drupal_root"' >> $TEMPFILE || true
......
......@@ -38,3 +38,13 @@ Description: Makefile used to create the platform:
default.
.
If this is left empty, Aegir will use its internal makefile.
Template:aegir/webserver
Type: select
Description: Webserver type to use:
Aegir supports two different webserver engines. You need to select
which one you wish to use to deploy the main frontend
interface. Regardless of the option chosen here, you can still deploy
other webserver types on remote servers.
Default: apache2
Choices: apache2, nginx
......@@ -11,7 +11,7 @@ Vcs-browser: http://drupalcode.org/project/provision.git
Package: aegir-provision
Architecture: all
Depends: ${misc:Depends}, drush (>= 5.5), php5-mysql, mysql-client, sudo, mail-transport-agent, apache2, adduser, ucf
Depends: ${misc:Depends}, drush (>= 5.5), php5-mysql, mysql-client, sudo, mail-transport-agent, apache2 | nginx, adduser, ucf
Recommends: mysql-server, rsync
Suggests: drush-make
Description: mass Drupal hosting system - backend
......@@ -29,7 +29,7 @@ Description: mass Drupal hosting system - backend
Package: aegir-hostmaster
Architecture: all
Depends: ${misc:Depends}, drush (>= 5.5), php5-mysql, apache2, libapache2-mod-php5, aegir-provision (>= ${source:Version}), git-core, unzip, lsb-base (>= 3.0-6)
Depends: ${misc:Depends}, drush (>= 5.5), php5-mysql, apache2 | nginx, libapache2-mod-php5 | php5-fpm, aegir-provision (>= ${source:Version}), git-core, unzip, lsb-base (>= 3.0-6)
Recommends: php5-gd, php5
Description: mass Drupal hosting system - frontend
A set of contributed modules for Drupal that aims to solve the
......
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