aboutsummaryrefslogtreecommitdiffstats
path: root/docs/install
diff options
context:
space:
mode:
Diffstat (limited to 'docs/install')
-rw-r--r--docs/install/ami.md6
-rw-r--r--docs/install/docker.md3
-rw-r--r--docs/install/vagrant.md30
3 files changed, 35 insertions, 4 deletions
diff --git a/docs/install/ami.md b/docs/install/ami.md
index fd283945a..fd165691e 100644
--- a/docs/install/ami.md
+++ b/docs/install/ami.md
@@ -24,9 +24,9 @@ for a year](http://aws.amazon.com/free/).
### Using our pre-built AMI
The AMI we've prepared for you can be found in the **EU West (Ireland)**
-region, with the ID `ami-05386aa7b2b4faee9` and name "FixMyStreet installation
-full 2018-12-21". You can launch an instance based on that AMI with
-[this link](https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-05386aa7b2b4faee9).
+region, with the ID `ami-03a135410792a8eb5` and name "FixMyStreet installation
+full 2020-03-05". You can launch an instance based on that AMI with
+[this link](https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-03a135410792a8eb5).
This AMI is based on the [latest tagged release](https://github.com/mysociety/fixmystreet/releases)
and contains everything you need to get a base install up and running.
diff --git a/docs/install/docker.md b/docs/install/docker.md
index 3c716a5da..79e3bcb84 100644
--- a/docs/install/docker.md
+++ b/docs/install/docker.md
@@ -46,7 +46,8 @@ repository/directory that contains the following (all items optional):
perllib/FixMyStreet/Cobrand/(CoBrand.pm)
web/cobrands/(cobrand)/
-Create a docker-compose.override.yml file containing:
+Create a docker-compose.override.yml file in the root of the fixmystreet
+repository (alongside docker-compose.yml) containing:
version: '3'
diff --git a/docs/install/vagrant.md b/docs/install/vagrant.md
index 98f846644..55b7802ac 100644
--- a/docs/install/vagrant.md
+++ b/docs/install/vagrant.md
@@ -68,3 +68,33 @@ The server will now be running and you can visit it at the address
The username and password to access the admin (at address
`http://fixmystreet.127.0.0.1.xip.io:3000/admin/`) will have been shown at the
end of the `vagrant up` output.
+
+## Editing a cobrand
+
+If you're working on a cobrand in an external repository, you will want that
+cobrand available inside the virtual machine as well. To do this, you will need
+to add a line to the Vagrantfile in the FixMyStreet repository, along the lines of:
+
+ config.vm.synced_folder “../your-cobrand”, “/home/vagrant/your-cobrand”, :owner => “vagrant”, :group => “vagrant”
+
+Then restart your vagrant box. Once that is done, you can set up symlinks
+inside Vagrant, linking the various components of your cobrand into the right
+places in the core repository. For example, if your filesystem has a layout
+like this:
+
+ www/
+ fixmystreet/ # The checkout of the fixmystreet repository
+ my-cobrand-repo/
+ templates/web/(cobrand)/
+ templates/email/(cobrand)/
+ perllib/FixMyStreet/Cobrand/(CoBrand.pm)
+ web/cobrands/(cobrand)/
+
+Then within the fixmystreet repository, you could run:
+
+ ln -s -f -v ../my-cobrand-repo/perllib/FixMyStreet/Cobrand/(Cobrand.pm) perllib/FixMyStreet/Cobrand/
+ ln -s -f -v ../my-cobrand-repo/templates/web/(cobrand) templates/web/
+ ln -s -f -v ../my-cobrand-repo/templates/email/(cobrand) templates/email/
+ ln -s -f -v ../my-cobrand-repo/web/cobrands/(cobrand) web/cobrands/
+
+Restart the development server and your cobrand should be accessible.