diff options
Diffstat (limited to 'aegir.install')
-rw-r--r-- | aegir.install | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/aegir.install b/aegir.install index 73bfb5053834..5001df18f60e 100644 --- a/aegir.install +++ b/aegir.install @@ -1,6 +1,6 @@ post_install() { post_upgrade - + echo -n ">>> Testing that localhost resolves to an IP address assigned to a network interface... " [ $(ip addr | sed --quiet --regexp-extended 's/\s+inet6?\s([^\/]*).*/\1/p' | egrep '^(127.0.0.1|::1)$' | wc -l) -eq 0 ] && echo "Failed." || echo "Passed." @@ -24,7 +24,7 @@ post_install() { echo " --client_email=aegir@$(hostname) \\" echo " --aegir_host=$(hostname) aegir.$(hostname)" echo " 5. Reconfigure Aegir's nginx configuration to use UNIX sockets instead of a network loopback port:" - echo " # sed -i 's#127.0.0.1:9000#unix:/run/php-fpm/php-fpm.sock#' /usr/share/webapps/aegir/config/includes/nginx_vhost_common.conf" + echo " # sed -i 's#127.0.0.1:9000#unix:/run/php-fpm/php-fpm.sock#' /var/lib/aegir/config/includes/nginx_vhost_common.conf" echo " 6. Start and start on boot the Aegir stack target:" echo " # systemctl enable --now aegir.target" echo " 7. Enable the hosting_queued module/hosting feature, unmask the queue daemon service unit, and restart the Aegir stack:" @@ -46,14 +46,14 @@ post_upgrade() { [ $(getent passwd aegir &>/dev/null; echo $?) -eq 0 ] && { echo "User already exists; no action taken." } || { - useradd --gid $(id --group http) --home-dir /usr/share/webapps/aegir --non-unique --uid $(id --user http) aegir + useradd --gid $(id --group http) --home-dir /var/lib/aegir --non-unique --uid $(id --user http) aegir # Replace /etc/passwd with itself having the Aegir user rearranged above the HTTP user. tempfile=$(mktemp) cat <(sed -n '1,/^http/p' /etc/passwd | head -n-1) <(getent passwd aegir) <(sed -n '/^http/,$p' /etc/passwd | head -n-1) >| $tempfile install -m644 $tempfile /etc/passwd echo "Done." } - + echo '>>> Setting up shared system-wide drush configuration' echo ' by symlinking ~/.drush to /etc/drush for all users.' for user in $(cut --fields=1,6 --delimiter=: /etc/passwd | grep :/home); do @@ -76,5 +76,5 @@ pre_remove() { [ $(systemctl --system is-enabled aegir.target) = enabled ] && systemctl --system disable --now aegir.target [ $(systemctl --system is-active aegir.target) = enabled ] && systemctl --system stop --now aegir.target [ $(getent passwd aegir &>/dev/null; echo $?) -eq 0 ] && userdel aegir - echo ">>> There are still files related to Aegir at: /usr/share/webapps/aegir." + echo ">>> There are still files related to Aegir at: /var/lib/aegir." } |