aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2020-07-13 13:55:10 +0100
committerMatthew Somerville <matthew@mysociety.org>2020-07-15 11:49:00 +0100
commit1243e701620d71dfcf0eedb880f40e7fef59415d (patch)
tree7e50d417393c2426b57a74191ee7200f3477f2fe /docs
parent67823bc788ce744e1228a8602b9a5aa805771ced (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 'docs')
-rw-r--r--docs/install/manual-install.md2
-rw-r--r--docs/updating/ami.md4
-rw-r--r--docs/updating/index.md5
3 files changed, 7 insertions, 4 deletions
diff --git a/docs/install/manual-install.md b/docs/install/manual-install.md
index 408b419cb..35c654cf5 100644
--- a/docs/install/manual-install.md
+++ b/docs/install/manual-install.md
@@ -40,7 +40,7 @@ dependencies are listed in `conf/packages.generic`. To install all of them you
can run e.g.:
{% highlight bash %}
-$ sudo xargs -a conf/packages.generic apt-get install
+$ sudo bin/install_packages
{% endhighlight %}
A similar list of packages should work for other Debian-based distributions.
diff --git a/docs/updating/ami.md b/docs/updating/ami.md
index ff83e3aec..9f2f612ed 100644
--- a/docs/updating/ami.md
+++ b/docs/updating/ami.md
@@ -41,10 +41,12 @@ make sure they are all committed to your local branch and fork first, see
to try checking out your repository elsewhere and trying the merge there first,
to see if it there are any problems.
-After updating the code, you should run the following command to update any
+After updating the code, you should run the following commands to update any
needed dependencies and any schema changes to your database. It's a good idea
to take a backup of your database first.
+ admin@ip-10-58-191-98:/var/www/fixmystreet/fixmystreet$ sudo bin/install_packages
+
fms@ip-10-58-191-98:~/fixmystreet$ script/update
If you have made changes to the schema yourself, this may not work,
diff --git a/docs/updating/index.md b/docs/updating/index.md
index 2ab8ed6f5..ea1ce72cd 100644
--- a/docs/updating/index.md
+++ b/docs/updating/index.md
@@ -53,12 +53,13 @@ you are too worried to merge in case it breaks something.
## Subsequent dependency updates
-After updating the code, you should run the following command to update any
+After updating the code, you should run the following commands to update any
needed dependencies and any schema changes to your database. It's a good idea
to take a backup of your database first.
{% highlight bash %}
-script/update
+sudo bin/install_packages # (as your admin user)
+script/update # (as the fms user)
{% endhighlight %}
Of course, if you have made changes to the database schema yourself, this may