Commit 864ff50e authored by omega8cc's avatar omega8cc

Merge branch '7.x-3.x' of git.drupal.org:project/provision into 7.x-3.x

parents 54bf860f c8957b7c
usr/share/drush/commands/provision
var/aegir
var/aegir/config
usr/share/lintian/overrides
......@@ -47,6 +47,22 @@ case "$1" in
echo "running an older version of sudo"
echo "copy content of /usr/share/doc/aegir3-provision/examples/example.sudoers into /etc/sudoers for aegir to run properly"
fi
# fix permissions on installed directories
chown aegir:aegir "$VARLIB"
# Install composer.
curl -sS https://getcomposer.org/installer | php
mv composer.phar /usr/local/bin/composer
# Install Drush.
su -c "composer global require drush/drush:6.*" aegir
# Add composer's bin dir to the $PATH.
echo "export PATH=\"\$HOME/.composer/vendor/bin:\$PATH\"" >> ~aegir/.bashrc
# Symlink Drush for other users to use.
ln -s ~aegir/.composer/vendor/bin/drush /usr/local/bin
;;
abort-upgrade|abort-remove|abort-deconfigure)
......
......@@ -11,7 +11,7 @@ Vcs-browser: http://drupalcode.org/project/provision.git
Package: aegir3-provision
Architecture: all
Depends: ${misc:Depends}, drush (>= 5.10), php5-mysql, mysql-client | mariadb-client, sudo, postfix | mail-transport-agent, apache2 | nginx, adduser, ucf
Depends: ${misc:Depends}, php5-cli (>= 5.3), php5-mysql, mysql-client | mariadb-client, sudo, postfix | mail-transport-agent, apache2 | nginx, adduser, ucf
Recommends: mysql-server | mariadb-server, rsync
Conflicts: aegir-provision, aegir-provision2, aegir2-provision
Replaces: aegir-provision, aegir-provision2, aegir2-provision
......@@ -30,8 +30,8 @@ Description: mass Drupal hosting system - backend
Package: aegir3-hostmaster
Architecture: all
Depends: ${misc:Depends}, drush (>= 5.5), php5-mysql, apache2 | nginx, libapache2-mod-php5 | php5-fpm, aegir3-provision (>= ${source:Version}), git-core, unzip, lsb-base (>= 3.0-6)
Recommends: php5-gd, php5
Depends: ${misc:Depends}, php5-mysql, php5-gd, apache2 | nginx, libapache2-mod-php5 | php5-fpm, aegir3-provision (>= ${source:Version}), git-core, unzip, lsb-base (>= 3.0-6)
Recommends: php5
Conflicts: aegir-hostmaster, aegir-hostmaster2, aegir2-hostmaster
Replaces: aegir-hostmaster, aegir-hostmaster2, aegir2-hostmaster
Description: mass Drupal hosting system - frontend
......
......@@ -150,6 +150,7 @@ function install_main() {
}
catch (Exception $e) {
drush_set_error('DRUPAL_INSTALL_FAILED');
drush_log('Site installation caused an exception.', 'error');
dlm($e);
}
_provision_drupal_create_directories();
......
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