From 807e05b5d442370f5e9535a0bcc04315f1019fd4 Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Sun, 12 Oct 2014 20:27:02 +0100
Subject: [PATCH] merge use-dockerfiles-repo (tested it on k4 and it works),
 closes #11

---
 scripts/setup.sh              | 8 ++++----
 unit-files/haproxy.service    | 2 +-
 unit-files/mysql@.service     | 2 +-
 unit-files/nginx@.service     | 2 +-
 unit-files/wordpress@.service | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/setup.sh b/scripts/setup.sh
index f63bd60..175d22c 100755
--- a/scripts/setup.sh
+++ b/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
diff --git a/unit-files/haproxy.service b/unit-files/haproxy.service
index d32f369..8331b4b 100644
--- a/unit-files/haproxy.service
+++ b/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
 
diff --git a/unit-files/mysql@.service b/unit-files/mysql@.service
index cdbaeb5..d96dd96 100644
--- a/unit-files/mysql@.service
+++ b/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 
 
diff --git a/unit-files/nginx@.service b/unit-files/nginx@.service
index c91765d..b04ad69 100644
--- a/unit-files/nginx@.service
+++ b/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
 
diff --git a/unit-files/wordpress@.service b/unit-files/wordpress@.service
index 19d1083..96a5402 100644
--- a/unit-files/wordpress@.service
+++ b/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
 
-- 
GitLab