unit-files/discovery-u@.service

-[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 -euxc ' \
-  sleep 3; \
-  container_name=`echo ${URL}_web_1 | sed "s/\.//g" | sed "s/-//g"`; \
-  ip=`docker inspect --format \'{{.NetworkSettings.IPAddress}}\' $container_name`; \
-  etcdctl --peers 172.17.42.1:4001 set /services/web/%i \'{"ip":"\'$ip\'", "port":"80"}\';'
-ExecStop=-/usr/bin/etcdctl rm /services/web/%i
-

unit-files/discovery@.service

-[Unit]
-Description=%p for %i etcd registration
-
-# Requirements
-Requires=etcd.service
-
-# Dependency binding
-BindsTo=web@%i.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/bash -euxc ' \
-  ip=`docker inspect --format \'{{.NetworkSettings.IPAddress}}\' %i`; \
-  etcdctl --peers 172.17.42.1:4001 set /services/web/%i \'{"ip":"\'$ip\'", "port":"80"}\';'
-ExecStop=-/usr/bin/etcdctl rm /services/web/%i
-

unit-files/dovecot.service

-[Unit]
-Description=%p
-
-# Requirements
-Requires=docker.service
-Requires=mysql@mail.service
-Requires=backup@mail.timer
-
-# Dependency ordering
-After=docker.service
-After=mysql@mail.service
-Before=backup@mail.timer
-
-[Service]
-Restart=always
-RestartSec=10
-TimeoutStartSec=60
-TimeoutStopSec=15
-Type=notify
-NotifyAccess=all
-ExecStartPre=/usr/bin/docker run --rm -v /opt/bin:/opt/bin ibuildthecloud/systemd-docker
-ExecStartPre=-/usr/bin/docker kill dovecot
-ExecStartPre=-/usr/bin/docker rm dovecot
-ExecStart=/bin/bash -euxc ' \
-  /opt/bin/systemd-docker --env run \
-    --rm \
-    --name dovecot \
-    -v /data/domains/mail/dovecot/mail:/mail \
-    -v /data/domains/mail/TLS:/ssl \
-    -v /data/runtime/dev/log:/dev/log \
-    --env-file=/data/domains/mail/.env \
-    --link mysql-mail:db \
-    -p 993:993 \
-    indiepaas/dovecot'
-ExecReload=/usr/bin/docker restart dovecot
-ExecStop=/usr/bin/docker stop dovecot
-
-[Install]
-WantedBy=multi-user.target
-

unit-files/dump_all.service

+[Service]
+Type=oneshot
+Environment=PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin
+ExecStart=/opt/bin/dump_all.sh 

unit-files/dump_all.timer

+[Unit]
+Description=Run dump all dayly
+
+[Timer]
+OnCalendar=*-*-* 00:15:30
+
+[Install]
+WantedBy=timers.target

unit-files/git-puller.service

-[Unit]
-Description=Git pull on every git repo
-
-[Service]
-Type=oneshot
-TimeoutStartSec=0
-ExecStart=/bin/bash -euxc ' \
-  for directory in `find /data/domains/ -name .git -type d -prune -not -path "*/owncloud/data/*"`;do \
-    cd $directory; cd ..;\
-    git pull; \
-  done'
-

unit-files/git-puller.timer

-[Unit]
-Description=Git pull every 5 minutes
-
-[Timer]
-OnBootSec=5min
-OnUnitActiveSec=5min
-
-[Install]
-WantedBy=multi-user.target
-

unit-files/haproxy.path

-[Path]
-PathExists=/data/runtime/haproxy/haproxy.cfg
-
-[Install]
-WantedBy=multi-user.target
-

unit-files/haproxy.service

-[Unit]
-Description=%p
-
-# Requirements
-Requires=docker.service
-
-# Dependency ordering
-After=docker.service
-
-[Service]
-Restart=always
-RestartSec=20
-TimeoutStartSec=0
-ExecStartPre=-/usr/bin/docker kill %p
-ExecStartPre=-/usr/bin/docker rm %p
-ExecStart=/usr/bin/docker run \
-  --rm \
-  --name %p \
-  -v /data/runtime/haproxy:/etc/haproxy \
-  -p 80:80 \
-  -p 443:443 \
-  indiepaas/haproxy
-ExecReload=/usr/bin/docker restart %p
-ExecStop=/usr/bin/docker stop %p
-

unit-files/lamp@.service

-[Unit]
-Description=%p-%i
-
-# Requirements
-Requires=mysql@%i.service
-Requires=web@%i.service
-
-# Dependency ordering
-After=mysql@%i.service
-Before=web@%i.service
-
-# Dependency binding
-BindsTo=web@%i.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/data/domains/%i/.env
-ExecStart=/bin/bash -euxc ' \
-  application_folder=/data/domains/%i/${APPLICATION}; \
-  if [ ! -f $application_folder/.env ]; then \
-    cat /data/domains/%i/mysql/.env | sed s/MYSQL_PASS/DB_PASS/ > $application_folder/.env; \
-  fi;'
-
-[Install]
-WantedBy=multi-user.target
-

unit-files/mail-mon.service

+[Service]
+Type=oneshot
+ExecStart=/libre.sh/utils/mail-mon.sh

unit-files/ocsp.timer → unit-files/mail-mon.timer

 [Unit]
-Description=Daily timer for OCSP stapling
+Description=Run mail mon hourly and on boot
 
 [Timer]
 OnBootSec=15min
-OnUnitActiveSec=1day
+OnUnitActiveSec=1h
 
 [Install]
-WantedBy=multi-user.target
-
+WantedBy=timers.target

unit-files/mysql@.service

-[Unit]
-Description=%p-%i
-
-# Requirements
-Requires=docker.service
-
-# Dependency ordering
-After=docker.service
-Before=backup@%i.timer
-
-# Dependency binding
-BindsTo=lamp@%i.service
-
-[Service]
-Restart=always
-RestartSec=20
-TimeoutStartSec=0
-Type=notify
-NotifyAccess=all
-ExecStartPre=/usr/bin/docker run --rm -v /opt/bin:/opt/bin ibuildthecloud/systemd-docker
-ExecStartPre=-/usr/bin/docker kill %p-%i
-ExecStartPre=-/usr/bin/docker rm %p-%i
-ExecStartPre=/bin/bash -euxc ' \
-  mysql_folder=/data/domains/%i/mysql; \
-  if [ ! -d /data/runtime/domains/%i/mysql ]; then \
-    mkdir -p /data/runtime/domains/%i/mysql/db_files; \
-    if [ ! -d $mysql_folder ]; then \
-      mkdir -p $mysql_folder; \
-      pass=`echo $RANDOM  ${date} | md5sum | base64 | cut -c-10`; \
-      echo MYSQL_PASS=$pass > $mysql_folder/.env; \
-    fi; \
-  fi'
-
-ExecStart=/opt/bin/systemd-docker run \
-  --rm \
-  --name %p-%i \
-  -v /data/runtime/domains/%i/log/mysql:/var/log/mysql \
-  -v /data/runtime/domains/%i/%p/db_files:/var/lib/mysql \
-  --env-file /data/domains/%i/%p/.env \
-  indiepaas/mysql
-ExecReload=/usr/bin/docker restart %p-%i
-ExecStop=/usr/bin/docker stop %p-%i
-

unit-files/ocsp.service

-[Unit]
-Description=Get the OCSP data from the cert provider
-
-[Service]
-Type=oneshot
-TimeoutStartSec=0
-ExecStart=/bin/bash -euxc ' \
-  for cert in `ls /data/runtime/haproxy/approved-certs/*.pem`;do \
-    /data/indiehosters/utils/ocsp.sh $cert; \
-  done; \
-  systemctl restart haproxy; \
-  rm /tmp/*.crt'
-

unit-files/postfix.service

-[Unit]
-Description=%p
-
-# Requirements
-Requires=docker.service
-Requires=dovecot.service
-
-# Dependency ordering
-After=docker.service
-After=rsyslog.service
-After=dovecot.service
-
-[Service]
-Restart=always
-RestartSec=20
-TimeoutStartSec=0
-ExecStartPre=-/usr/bin/docker kill %p
-ExecStartPre=-/usr/bin/docker rm %p
-ExecStart=/usr/bin/docker run \
-  --rm \
-  --name %p \
-  --env-file=/data/domains/mail/.env \
-  -v /data/runtime/dev/log:/dev/log \
-  -v /data/runtime/postfix:/data \
-  -v /data/runtime/mail:/var/mail \
-  -v /data/domains/mail/TLS:/ssl \
-  -v /data/domains/mail/opendkim:/etc/opendkim \
-  --volumes-from=dovecot \
-  -p 25:25 \
-  -p 587:587 \
-  --link=mysql-mail:db \
-  indiepaas/postfix
-ExecReload=/usr/bin/docker restart %p
-ExecStop=/usr/bin/docker stop %p
-
-[Install]
-WantedBy=multi-user.target
-

unit-files/rsyslog.service → unit-files/s@.service

 [Unit]
-Description=%p
+Description=%p-%i
 
 # Requirements
 Requires=docker.service
@@ -9,19 +9,15 @@ After=docker.service
 
 [Service]
 Restart=always
-RestartSec=20
-TimeoutStartSec=0
-ExecStartPre=-/usr/bin/docker kill %p
-ExecStartPre=-/usr/bin/docker rm %p
-ExecStart=/usr/bin/docker run \
-  --rm \
-  --name rsyslog \
-  -v /data/runtime/dev:/dev \
-  -v /data/runtime/log:/var/log \
-  indiepaas/rsyslog
-ExecReload=/usr/bin/docker restart %p
-ExecStop=/usr/bin/docker stop %p
+RestartSec=10
+TimeoutStartSec=60
+TimeoutStopSec=15
+EnvironmentFile=-/system/%i/env
+Environment=HOSTNAME=%H
+WorkingDirectory=/system/%i/
+ExecStartPre=-docker-compose rm -f
+ExecStart=/bin/bash -euxc "docker-compose up"
+ExecStop=docker-compose stop
 
 [Install]
 WantedBy=multi-user.target
-

unit-files/static@.service

-[Unit]
-Description=%p-%i
-
-# Requirements
-Requires=web@%i.service
-
-# Dependency ordering
-Before=web@%i.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/bash -euxc ' \
-  application_folder=/data/domains/%i/%p/www-content; \
-  if [ ! -d $application_folder ]; then \
-    mkdir -p $application_folder; \
-    echo Hello %i > $application_folder/index.html; \
-  fi'
-
-[Install]
-WantedBy=multi-user.target
-

unit-files/swapon.service

+[Unit]
+Description=Turn on swap
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStartPre=-/bin/bash -euxc ' \
+  fallocate -l 8192m /swap &&\
+  chmod 600 /swap &&\
+  mkswap /swap'
+ExecStart=/sbin/swapon /swap
+ExecStop=/sbin/swapoff /swap
+[Install]
+WantedBy=local.target

unit-files/universal@.service → unit-files/u@.service

@@ -3,24 +3,21 @@ 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
+EnvironmentFile=-/data/domains/%i/env
+Environment=HOSTNAME=%H
 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'
+ExecStartPre=-docker-compose rm -f
+ExecStart=/bin/bash -euxc "LETSENCRYPT_HOST=%i VIRTUAL_HOST=%i,www.%i docker-compose up"
+ExecStop=docker-compose stop
 
 [Install]
 WantedBy=multi-user.target
-

unit-files/web-net.service

+[Unit]
+Description=Create lb_web network
+Requires=docker.service
+After=docker.service
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/bin/docker network create lb_web
+ExecStop=/usr/bin/docker network rm lb_web
+[Install]
+WantedBy=local.target