From c4d32cf8c5d1dbdde2f913863ac22fa49e479286 Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Thu, 11 Feb 2016 09:28:45 +0000
Subject: [PATCH] No more universal services \o/
---
unit-files/backup-u@.service | 40 ---------------------------------
unit-files/backup-u@.timer | 11 ---------
unit-files/discovery-u@.service | 24 --------------------
unit-files/universal@.service | 26 ---------------------
4 files changed, 101 deletions(-)
delete mode 100644 unit-files/backup-u@.service
delete mode 100644 unit-files/backup-u@.timer
delete mode 100644 unit-files/discovery-u@.service
delete mode 100644 unit-files/universal@.service
diff --git a/unit-files/backup-u@.service b/unit-files/backup-u@.service
deleted file mode 100644
index afa4a56..0000000
--- a/unit-files/backup-u@.service
+++ /dev/null
@@ -1,40 +0,0 @@
-[Unit]
-Description=Back up data from %i
-
-[Service]
-Type=oneshot
-TimeoutStartSec=3000
-WorkingDirectory=/data/domains/%i/
-EnvironmentFile=/etc/environment
-ExecStartPre=-/bin/docker kill clean-%i
-ExecStartPre=-/bin/docker rm clean-%i
-ExecStartPre=-/bin/docker kill backup-%i
-ExecStartPre=-/bin/docker rm backup-%i
-ExecStartPre=/bin/bash -euxc ' \
- /bin/docker run \
- --rm \
- --name clean-%i \
- -e PASSPHRASE \
- -v /root:/root \
- indiepaas/duplicity \
- remove-older-than 10D \
- sftp://${BACKUP_DESTINATION}//data/%i'
-ExecStartPre=/bin/bash -euxc '/data/domains/%i/BACKUP'
-ExecStart=/bin/bash -euxc ' \
- /bin/docker run \
- --rm \
- --name backup-%i \
- -e PASSPHRASE \
- -h backup.container \
- --cpu-shares=40 \
- -e PASSPHRASE \
- -v /dev/random:/dev/random \
- -v /dev/urandom:/dev/urandom \
- -v /root:/root \
- -v /data/domains/%i:/backup indiepaas/duplicity \
- --volsize 500 \
- --full-if-older-than 7D \
- --asynchronous-upload \
- --encrypt-key ${ENCRYPT_KEY} \
- /backup \
- sftp://${BACKUP_DESTINATION}//data/%i'
diff --git a/unit-files/backup-u@.timer b/unit-files/backup-u@.timer
deleted file mode 100644
index ee948a2..0000000
--- a/unit-files/backup-u@.timer
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Hourly backup of www and mysql content.
-
-# Dependency binding
-BindsTo=universal@%i.service
-
-[Timer]
-OnActiveSec=20
-OnUnitActiveSec=60min
-AccuracySec=50min
-
diff --git a/unit-files/discovery-u@.service b/unit-files/discovery-u@.service
deleted file mode 100644
index 62b24e2..0000000
--- a/unit-files/discovery-u@.service
+++ /dev/null
@@ -1,24 +0,0 @@
-[Unit]
-Description=%p for %i etcd registration
-
-# Requirements
-Requires=etcd.service
-
-# Dependency binding
-BindsTo=universal@%i.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=URL=%i
-ExecStart=/bin/bash -xc ' \
- ip=""; \
- while [ -z $ip ]; \
- do \
- container_name=`echo ${URL}_web_1 | sed "s/\.//g" | sed "s/-//g"`; \
- ip=`docker inspect --format \'{{.NetworkSettings.IPAddress}}\' $container_name`; \
- sleep 1; \
- done; \
- etcdctl --peers 172.17.42.1:4001 set /services/web/%i \'{"ip":"\'$ip\'", "port":"80"}\';'
-ExecStop=-/usr/bin/etcdctl rm /services/web/%i
-
diff --git a/unit-files/universal@.service b/unit-files/universal@.service
deleted file mode 100644
index 2419ab4..0000000
--- a/unit-files/universal@.service
+++ /dev/null
@@ -1,26 +0,0 @@
-[Unit]
-Description=%p-%i
-
-# Requirements
-Requires=docker.service
-Requires=discovery-u@%i.service
-Requires=backup-u@%i.timer
-
-# Dependency ordering
-After=docker.service
-Before=discovery-u@%i.service
-Before=backup-u@%i.timer
-
-[Service]
-Restart=always
-RestartSec=10
-TimeoutStartSec=60
-TimeoutStopSec=15
-WorkingDirectory=/data/domains/%i/
-ExecStartPre=/bin/cp /data/domains/%i/TLS/%i.pem /data/runtime/haproxy/approved-certs/%i.pem
-ExecStart=/bin/bash -euxc '/data/domains/%i/RUN'
-ExecStop=/bin/bash -euxc '/data/domains/%i/STOP'
-
-[Install]
-WantedBy=multi-user.target
-
--
GitLab