From f9b3e3fd35615f898398d326e1d1df023f3c4324 Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Fri, 17 Oct 2014 12:47:40 +0100
Subject: [PATCH] %s/infrastructure/indiehosters
---
README.md | 2 +-
Vagrantfile | 4 ++--
importers/wordpress.sh | 2 +-
scripts/setup.sh | 2 +-
unit-files/mysql-importer@.service | 2 +-
unit-files/nginx-importer@.service | 2 +-
unit-files/wordpress-importer@.service | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index f646fe0..f7677dd 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ the host system.
```bash
vagrant ssh
-sudo sh /data/infrastructure/scripts/approve-user.sh example.dev wordpress
+sudo sh /data/indiehosters/scripts/approve-user.sh example.dev wordpress
```
Check https://example.dev in your bowser!
diff --git a/Vagrantfile b/Vagrantfile
index dcaab64..fe2500e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -42,9 +42,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
core.vm.hostname = HOSTNAME
core.hostsupdater.aliases = ["example.dev"]
core.vm.network :private_network, ip: "#{BASE_IP_ADDR}.#{i+1}"
- core.vm.synced_folder ".", "/data/infrastructure", id: "coreos-infrastructure", :nfs => true, :mount_options => ['nolock,vers=3,udp']
+ core.vm.synced_folder ".", "/data/indiehosters", id: "coreos-indiehosters", :nfs => true, :mount_options => ['nolock,vers=3,udp']
core.vm.provision :file, source: "./cloud-config", destination: "/tmp/vagrantfile-user-data"
- core.vm.provision :shell, inline: "cp /data/infrastructure/scripts/unsecure-certs/*.pem /data/server-wide/haproxy/approved-certs"
+ core.vm.provision :shell, inline: "cp /data/indiehosters/scripts/unsecure-certs/*.pem /data/server-wide/haproxy/approved-certs"
core.vm.provision :shell, path: "./scripts/setup.sh", args: [HOSTNAME]
core.vm.provision :shell, inline: "etcdctl set /services/default '{\"app\":\"nginx\", \"hostname\":\"#{HOSTNAME}\"}'"
core.vm.provision :shell, path: "./scripts/approve-user.sh", args: [HOSTNAME, "nginx"]
diff --git a/importers/wordpress.sh b/importers/wordpress.sh
index 6e38abb..7e1f056 100755
--- a/importers/wordpress.sh
+++ b/importers/wordpress.sh
@@ -2,6 +2,6 @@
if [ ! -d "/data/per-user/$USER/wordpress/data" ]; then
cd /data/per-user/$USER/
- tar xvzf /data/infrastructure/blueprints/wordpress.tgz
+ tar xvzf /data/indiehosters/blueprints/wordpress.tgz
cat /data/per-user/$USER/mysql/.env | sed s/MYSQL_PASS/DB_PASS/ > /data/per-user/$USER/wordpress/.env
fi
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 4423360..3c680b9 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -6,7 +6,7 @@ if [ -f /tmp/vagrantfile-user-data ]; then
fi
# Install unit-files
-cp /data/infrastructure/unit-files/* /etc/systemd/system
+cp /data/indiehosters/unit-files/* /etc/systemd/system
systemctl daemon-reload
# Pull relevant docker images
diff --git a/unit-files/mysql-importer@.service b/unit-files/mysql-importer@.service
index f05608d..77af011 100644
--- a/unit-files/mysql-importer@.service
+++ b/unit-files/mysql-importer@.service
@@ -6,7 +6,7 @@ Before=mysql@%i.service
Type=oneshot
RemainAfterExit=yes
Environment=USER=%i
-ExecStart=/data/infrastructure/importers/mysql.sh
+ExecStart=/data/indiehosters/importers/mysql.sh
[Install]
WantedBy=mysql@%i.service
diff --git a/unit-files/nginx-importer@.service b/unit-files/nginx-importer@.service
index dfb71b7..3a0e439 100644
--- a/unit-files/nginx-importer@.service
+++ b/unit-files/nginx-importer@.service
@@ -6,7 +6,7 @@ Before=nginx@%i.service
Type=oneshot
RemainAfterExit=yes
Environment=USER=%i
-ExecStart=/data/infrastructure/importers/nginx.sh
+ExecStart=/data/indiehosters/importers/nginx.sh
[Install]
WantedBy=nginx@%i.service
diff --git a/unit-files/wordpress-importer@.service b/unit-files/wordpress-importer@.service
index c1a4771..33f5665 100644
--- a/unit-files/wordpress-importer@.service
+++ b/unit-files/wordpress-importer@.service
@@ -7,7 +7,7 @@ Before=wordpress@%i.service
Type=oneshot
RemainAfterExit=yes
Environment=USER=%i
-ExecStart=/data/infrastructure/importers/wordpress.sh
+ExecStart=/data/indiehosters/importers/wordpress.sh
[Install]
WantedBy=wordpress@%i.service
--
GitLab