edit instructions for developing infrastructure

deploy/onServer.sh

@@ -3,13 +3,13 @@
 echo Starting etcd:
 /usr/bin/coreos-cloudinit --from-file=/var/lib/coreos-install/user_data
 
-echo Cloning the infrastructure repo into /data/infrastructure:
+echo Cloning the indiehosters repo into /data/indiehosters:
 mkdir /data
 cd /data
-git clone https://github.com/indiehosters/infrastructure.git
-cd infrastructure
+git clone https://github.com/indiehosters/indiehosters.git
+cd indiehosters
 
-echo Checking out $1 branch of the IndieHosters infrastructure:
+echo Checking out $1 branch of the IndieHosters indiehosters:
 git checkout $1
 git pull
 

doc/deploying-a-server.md

@@ -36,7 +36,7 @@ on your laptop.
   * Unless there is already a TLS certificate at `indiehosters/user-data/example.com/tls.pem` get one
     (from StartSSL or elswhere) for example.com and concatenate the certificate
     and its unencrypted private key into `indiehosters/user-data/example.com/tls.pem`
-  * Make sure the TLS certificate is valid (use `indiehosters/infrastructure/scripts/check-cert.sh` for this), and if it is,
+  * Make sure the TLS certificate is valid (use `indiehosters/indiehosters/scripts/check-cert.sh` for this), and if it is,
     copy it from
     `indiehosters/user-data/example.com/tls.pem` 
     to `indiehosters/orchestration/TLS/approved-certs/example.com.pem`.
@@ -49,7 +49,7 @@ on your laptop.
 
 ## Deploying a mailserver
 
-Right now, this is still a bit separate from the rest of the infrastructure - just get a server with Docker (doesn't have to be coreos), and run:
+Right now, this is still a bit separate from the rest of the indiehosters - just get a server with Docker (doesn't have to be coreos), and run:
 
 ```bash
 docker run -d -p 25:25 -p 443:443 indiehosters/yunohost /sbin/init

doc/developing-dockerfiles-and-infrastructure.md

@@ -6,13 +6,13 @@ To develop Dockerfiles, you can use a server that's not serving any live domains
 
 ## Developing infrastructure
 
-To develop the infrastructure, create a branch on the infrastructure repo and specify that branch at the end of the deploy command, for instance:
+To develop the infrastructure, create a branch on this repo and specify that branch at the end of the deploy command, for instance:
 
 ```bash
 sh ./deploy/deploy.sh k4 dev
 ```
 
-Will deploy a server at whatever IP address "k4" points to in your /etc/hosts, using the "dev" branch of https://github.com/indiehosters/infrastructure.
+That will deploy a server at whatever IP address "k4" points to in your /etc/hosts, using the "dev" branch of https://github.com/indiehosters/indiehosters.
 
 ## Testing new Dockerfiles in the infrastructure
 
@@ -24,5 +24,6 @@ To test the infrastructure with a changed Dockerfile, you need to take several s
 * In this branch, grep for the Dockerfile you are updating, and replace its name with the experimental one everywhere:
   * the `docker pull` statement in scripts/setup.sh
   * the `docker run` statement in the appropriate systemd service file inside unit-files/
-* Push the branch to the https://github.com/indiehosters/infrastructure repo
+* Push the branch to the https://github.com/indiehosters/indiehosters repo (if you don't have access to that, you will have to edit
+  `deploy/onServer.sh` to use a different repo, to which you do have access).
 * Now deploy a server from your experimental infrastructure branch (which references your experimental Docker image), as described above at "Developing infrastructure"