merge use-dockerfiles-repo (tested it on k4 and it works), closes #11

scripts/setup.sh

@@ -10,10 +10,10 @@ cp /data/infrastructure/unit-files/* /etc/systemd/system
 systemctl daemon-reload
 
 # Pull relevant docker images
-docker pull pierreozoux/haproxy-confd
-docker pull tutum/mysql
-docker pull tutum/wordpress-stackable
-docker pull tutum/nginx
+docker pull indiehosters/haproxy-confd
+docker pull indiehosters/mysql
+docker pull indiehosters/wordpress
+docker pull indiehosters/nginx
 
 # Configure and start HAproxy
 mkdir -p /data/server-wide/haproxy/approved-certs

unit-files/haproxy.service

@@ -13,7 +13,7 @@ ExecStart=/usr/bin/docker run\
 -p 80:80\
 -p 443:443\
 -v /data/server-wide/haproxy/approved-certs/:/etc/haproxy/approved-certs\
-pierreozoux/haproxy-confd
+indiehosters/haproxy-confd
 ExecReload=/usr/bin/docker restart %p
 ExecStop=/usr/bin/docker stop %p
 

unit-files/mysql@.service

@@ -14,7 +14,7 @@ ExecStart=/usr/bin/docker run\
 --name %p-%i\
 -v /data/per-user/%i/%p/data:/var/lib/mysql\
 --env-file /data/per-user/%i/%p/.env\
-tutum/mysql
+indiehosters/mysql
 ExecReload=/usr/bin/docker restart %p-%i
 ExecStop=/usr/bin/docker stop %p-%i 
 

unit-files/nginx@.service

@@ -17,7 +17,7 @@ ExecStart=/usr/bin/docker run\
 --name %p-%i\
 -v /data/per-user/%i/%p/data/www-content:/app\
 --env-file /data/per-user/%i/%p/.env\
-tutum/nginx
+indiehosters/nginx
 ExecReload=/usr/bin/docker restart %p-%i
 ExecStop=/usr/bin/docker stop %p-%i
 

unit-files/wordpress@.service

@@ -23,7 +23,7 @@ ExecStart=/usr/bin/docker run\
 -v /data/per-user/%i/%p/data/wp-content:/app/wp-content\
 -v /data/per-user/%i/%p/data/.htaccess:/app/.htaccess\
 --env-file /data/per-user/%i/%p/.env\
-tutum/wordpress-stackable
+indiehosters/wordpress
 ExecReload=/usr/bin/docker restart %p-%i
 ExecStop=/usr/bin/docker stop %p-%i