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

do not Depend on later sudo

we now inform the user if sudo cannot be configured automatically,
instead of just failing to install because of silly dependencies.
parent 98809b85
...@@ -51,10 +51,15 @@ case "$1" in ...@@ -51,10 +51,15 @@ case "$1" in
cp /usr/share/doc/aegir-provision/examples/examples.sudoers $TEMPFILE cp /usr/share/doc/aegir-provision/examples/examples.sudoers $TEMPFILE
fi fi
ucf --debconf-ok $TEMPFILE /etc/sudoers.d/aegir if [ -d /etc/sudoers.d ]; then
rm -f $TEMPFILE ucf --debconf-ok $TEMPFILE /etc/sudoers.d/aegir
ucfr aegir-provision /etc/sudoers.d/aegir rm -f $TEMPFILE
chmod 440 /etc/sudoers.d/aegir ucfr aegir-provision /etc/sudoers.d/aegir
chmod 440 /etc/sudoers.d/aegir
else
echo "running an older version of sudo"
echo "you'll need to copy the content of /etc/sudoers.d/aegir into /etc/sudoersi for aegir to run properly"
fi
# fix permissions on installed directories # fix permissions on installed directories
chown aegir:aegir "$VARLIB" chown aegir:aegir "$VARLIB"
......
...@@ -11,7 +11,7 @@ Vcs-browser: http://git.koumbit.net/?p=drupal/modules/provision ...@@ -11,7 +11,7 @@ Vcs-browser: http://git.koumbit.net/?p=drupal/modules/provision
Package: aegir-provision Package: aegir-provision
Architecture: all Architecture: all
Depends: ${misc:Depends}, drush (>= 2.0), php5-mysql, mysql-client, sudo (>= 1.7.2p1-1), postfix | mail-transport-agent, apache2 | apache, adduser, ucf Depends: ${misc:Depends}, drush (>= 2.0), php5-mysql, mysql-client, sudo, postfix | mail-transport-agent, apache2 | apache, adduser, ucf
Recommends: mysql-server Recommends: mysql-server
Description: backend of the Aegir hosting system Description: backend of the Aegir hosting system
Provision is a component of the Aegir hosting system. Provision is a component of the Aegir hosting system.
......
Supports Markdown
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