Commit bfa519bf authored by helmo's avatar helmo

Issue #2951662: Actually install sudoers.example, to avoid failure on systems...

Issue #2951662: Actually install sudoers.example, to avoid failure on systems ignoring /usr/share/doc/

It turned out that the ubuntu:bionic Dcoker image is ignoring /usr/share/doc/
via /etc/dpkg/dpkg.cfg.d/excludes. Which results in installation failure.
parent 2e985504
......@@ -41,12 +41,12 @@ case "$1" in
adduser --quiet aegir www-data
if [ -d /etc/sudoers.d ]; then
ucf --debconf-ok /usr/share/doc/aegir3-cluster-slave/examples/example.sudoers /etc/sudoers.d/aegir
ucf --debconf-ok /usr/share/drush/commands/provision/example.sudoers /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 "copy content of /usr/share/doc/aegir-provision/examples/example.sudoers into /etc/sudoers for aegir to run properly"
echo "copy content of /usr/share/drush/commands/provision/example.sudoers into /etc/sudoers for aegir to run properly"
fi
# fix permissions on installed directories
......
......@@ -40,12 +40,12 @@ case "$1" in
adduser --quiet aegir www-data
if [ -d /etc/sudoers.d ]; then
ucf --debconf-ok /usr/share/doc/aegir3-provision/examples/example.sudoers /etc/sudoers.d/aegir
ucf --debconf-ok /usr/share/drush/commands/provision/example.sudoers /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 "copy content of /usr/share/doc/aegir3-provision/examples/example.sudoers into /etc/sudoers for aegir to run properly"
echo "copy content of /usr/share/drush/commands/provision/example.sudoers into /etc/sudoers for aegir to run properly"
fi
# fix permissions on installed directories
......
......@@ -10,7 +10,7 @@
override_dh_auto_install:
dh_auto_install
cp -r "$(CURDIR)/db/" "$(CURDIR)/http/" "$(CURDIR)/"*.make "$(CURDIR)/platform/" "$(CURDIR)/Provision/" "$(CURDIR)/Symfony/" "$(CURDIR)"/*.inc "$(CURDIR)"/*.php "$(CURDIR)"/*.info "$(CURDIR)/debian/aegir3-provision/usr/share/drush/commands/provision/"
cp -r "$(CURDIR)/db/" "$(CURDIR)/http/" "$(CURDIR)/"*.make "$(CURDIR)/platform/" "$(CURDIR)/Provision/" "$(CURDIR)/Symfony/" "$(CURDIR)"/*.inc "$(CURDIR)"/*.php "$(CURDIR)"/*.info "$(CURDIR)/example.sudoers" "$(CURDIR)/debian/aegir3-provision/usr/share/drush/commands/provision/"
# We need this nasty hack, because we added directories.
# TODO: this is really lame, there must be a better way to do this?
......
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