diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2020-07-13 13:55:10 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2020-07-15 11:49:00 +0100 |
| commit | 1243e701620d71dfcf0eedb880f40e7fef59415d (patch) | |
| tree | 7e50d417393c2426b57a74191ee7200f3477f2fe /bin | |
| parent | 67823bc788ce744e1228a8602b9a5aa805771ced (diff) | |
Do not have bootstrap run sudo commands.
Your site user may not have access to sudo, and your admin user may
cause permission issues if used to do the git checkout, or the Perl
module installation. Document the separate script to install system
packages instead.
Co-authored-by: Sam Pearson <sam@mysociety.org>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/docker.preinit | 1 | ||||
| -rwxr-xr-x | bin/install_packages | 2 | ||||
| -rw-r--r-- | bin/site-specific-install.sh | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/bin/docker.preinit b/bin/docker.preinit index 459e89de2..501878185 100644 --- a/bin/docker.preinit +++ b/bin/docker.preinit @@ -34,6 +34,7 @@ fi su $FMS_DB_USER -c "${FMS_ROOT}/bin/docker-cobrand" # Ensure things are up to date - schema, CSS, etc +${FMS_ROOT}/bin/install_packages docker su $FMS_DB_USER -c "${FMS_ROOT}/script/update" # Update reports diff --git a/bin/install_packages b/bin/install_packages index 7b4bfd8e1..c7f1b9446 100755 --- a/bin/install_packages +++ b/bin/install_packages @@ -3,7 +3,7 @@ set -e cd "$(dirname "${BASH_SOURCE[0]}")/.." -PACKAGE_FILE=conf/packages +PACKAGE_FILE=conf/packages.generic [ -n "$1" ] && PACKAGE_FILE="conf/packages.${1}" diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index af52dbdbc..2b773fecb 100644 --- a/bin/site-specific-install.sh +++ b/bin/site-specific-install.sh @@ -54,8 +54,6 @@ fi install_website_packages -su -l -c "touch '$DIRECTORY/admin-htpasswd'" "$UNIX_USER" - if [ $INSTALL_DB = true ]; then add_postgresql_user fi |