From 0e88aa241866e345b68f878e32ec9215066d196e Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Wed, 29 Oct 2014 17:01:14 +0000
Subject: [PATCH] fix gitpuller after revert
---
importers/gitpuller.sh | 2 +-
unit-files/{gitpuller@.path => nginx-gitpuller@.path} | 0
.../{gitpuller@.service => nginx-gitpuller@.service} | 1 +
unit-files/{gitpuller@.timer => nginx-gitpuller@.timer} | 0
unit-files/nginx@.service | 2 +-
unit-files/wordpress-subdir-gitpuller@.path | 2 ++
unit-files/wordpress-subdir-gitpuller@.service | 7 +++++++
unit-files/wordpress-subdir-gitpuller@.timer | 8 ++++++++
unit-files/wordpress-subdir@.service | 2 +-
9 files changed, 21 insertions(+), 3 deletions(-)
rename unit-files/{gitpuller@.path => nginx-gitpuller@.path} (100%)
rename unit-files/{gitpuller@.service => nginx-gitpuller@.service} (83%)
rename unit-files/{gitpuller@.timer => nginx-gitpuller@.timer} (100%)
create mode 100644 unit-files/wordpress-subdir-gitpuller@.path
create mode 100644 unit-files/wordpress-subdir-gitpuller@.service
create mode 100644 unit-files/wordpress-subdir-gitpuller@.timer
diff --git a/importers/gitpuller.sh b/importers/gitpuller.sh
index 034a402..2b37d98 100755
--- a/importers/gitpuller.sh
+++ b/importers/gitpuller.sh
@@ -1,3 +1,3 @@
#!/bin/bash
-cd /data/per-user/$USER/nginx/data/www-content && git pull
+cd /data/per-user/$USER/$APP/data/www-content && git pull
diff --git a/unit-files/gitpuller@.path b/unit-files/nginx-gitpuller@.path
similarity index 100%
rename from unit-files/gitpuller@.path
rename to unit-files/nginx-gitpuller@.path
diff --git a/unit-files/gitpuller@.service b/unit-files/nginx-gitpuller@.service
similarity index 83%
rename from unit-files/gitpuller@.service
rename to unit-files/nginx-gitpuller@.service
index e9c8490..c3b0937 100644
--- a/unit-files/gitpuller@.service
+++ b/unit-files/nginx-gitpuller@.service
@@ -3,4 +3,5 @@ Description= git puller
[Service]
Environment=USER=%i
+Environment=APP=nginx
ExecStart=/data/indiehosters/importers/gitpuller.sh
diff --git a/unit-files/gitpuller@.timer b/unit-files/nginx-gitpuller@.timer
similarity index 100%
rename from unit-files/gitpuller@.timer
rename to unit-files/nginx-gitpuller@.timer
diff --git a/unit-files/nginx@.service b/unit-files/nginx@.service
index 9b6c733..48f6485 100644
--- a/unit-files/nginx@.service
+++ b/unit-files/nginx@.service
@@ -5,7 +5,7 @@ Description=%p-%i
Requires=docker.service
Requires=%p-importer@%i.service
Requires=%p-discovery@%i.service
-Wants=gitpuller@%i.service
+Wants=%p-gitpuller@%i.service
# Dependency ordering
After=docker.service
diff --git a/unit-files/wordpress-subdir-gitpuller@.path b/unit-files/wordpress-subdir-gitpuller@.path
new file mode 100644
index 0000000..92ce7d1
--- /dev/null
+++ b/unit-files/wordpress-subdir-gitpuller@.path
@@ -0,0 +1,2 @@
+[Path]
+PathExists=/data/per-user/%i/wordpress-subdir/data/GITURL
diff --git a/unit-files/wordpress-subdir-gitpuller@.service b/unit-files/wordpress-subdir-gitpuller@.service
new file mode 100644
index 0000000..8b65127
--- /dev/null
+++ b/unit-files/wordpress-subdir-gitpuller@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description= git puller
+
+[Service]
+Environment=USER=%i
+Environment=APP=wordpress-subdir
+ExecStart=/data/indiehosters/importers/gitpuller.sh
diff --git a/unit-files/wordpress-subdir-gitpuller@.timer b/unit-files/wordpress-subdir-gitpuller@.timer
new file mode 100644
index 0000000..78faa1e
--- /dev/null
+++ b/unit-files/wordpress-subdir-gitpuller@.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=Run git puller every 10 minutes
+
+[Timer]
+OnUnitActiveSec=10min
+
+[Install]
+WantedBy=timers.target
diff --git a/unit-files/wordpress-subdir@.service b/unit-files/wordpress-subdir@.service
index 201d7e1..263f31e 100644
--- a/unit-files/wordpress-subdir@.service
+++ b/unit-files/wordpress-subdir@.service
@@ -7,7 +7,7 @@ Requires=etcd.service
Requires=mysql@%i.service
Requires=%p-importer@%i.service
Requires=%p-discovery@%i.service
-Wants=gitpuller@%i.service
+Wants=%p-gitpuller@%i.service
# Dependency ordering
After=docker.service
--
GitLab