diff --git a/config/common/systemd/container-build@.service b/config/common/systemd/container-build@.service index 653b4ad..e130e7b 100644 --- a/config/common/systemd/container-build@.service +++ b/config/common/systemd/container-build@.service @@ -1,5 +1,5 @@ [Unit] -Description=Container build for %I +Description=Container Build for %I Wants=network-online.target container-environment@%i.service container-network@internal.service container-build@%i.path After=network-online.target container-environment@%i.service container-network@internal.service ConditionPathExists=%E/coreos-home-server/%i/Containerfile diff --git a/config/common/systemd/container-environment@.service b/config/common/systemd/container-environment@.service index 2fc70cf..5449a8d 100644 --- a/config/common/systemd/container-environment@.service +++ b/config/common/systemd/container-environment@.service @@ -1,5 +1,5 @@ [Unit] -Description=Container environment for %I +Description=Container Environment for %I ConditionPathExists=%E/coreos-home-server/host.env ConditionPathExists=%E/coreos-home-server/%i/%i.env.template diff --git a/config/common/systemd/container-network@.service b/config/common/systemd/container-network@.service index ada0926..2534db0 100644 --- a/config/common/systemd/container-network@.service +++ b/config/common/systemd/container-network@.service @@ -1,5 +1,5 @@ [Unit] -Description=Container network for %I +Description=Container Network for %I Wants=network-online.target After=network-online.target ConditionPathExists=!/etc/cni/net.d/%i.conflist diff --git a/config/common/systemd/container-volume-backup@.service b/config/common/systemd/container-volume-backup@.service index 01d263f..3f05387 100644 --- a/config/common/systemd/container-volume-backup@.service +++ b/config/common/systemd/container-volume-backup@.service @@ -1,5 +1,5 @@ [Unit] -Description=Backup for container volume %I +Description=Backup for Container Volume %I [Service] Type=oneshot diff --git a/config/common/systemd/container-volume-backup@.timer b/config/common/systemd/container-volume-backup@.timer index 6807f97..46f2d48 100644 --- a/config/common/systemd/container-volume-backup@.timer +++ b/config/common/systemd/container-volume-backup@.timer @@ -1,5 +1,5 @@ [Unit] -Description=Scheduled backup for container volume %i +Description=Scheduled Backup for Container Volume %i [Timer] OnCalendar=00/12:30 diff --git a/config/common/systemd/container-volume-restore@.service b/config/common/systemd/container-volume-restore@.service index 5ac5e37..97498d0 100644 --- a/config/common/systemd/container-volume-restore@.service +++ b/config/common/systemd/container-volume-restore@.service @@ -1,5 +1,5 @@ [Unit] -Description=Restore from backup for container volume %I +Description=Restore from Backup for Container Volume %I ConditionFileNotEmpty=%S/backups/coreos-home-server/%i/%i-latest.tar.gz [Service] diff --git a/config/common/systemd/container-volume@.service b/config/common/systemd/container-volume@.service index 4643b5e..dddab25 100644 --- a/config/common/systemd/container-volume@.service +++ b/config/common/systemd/container-volume@.service @@ -1,5 +1,5 @@ [Unit] -Description=Container volume for %I +Description=Container Volume for %I Wants=container-volume-restore@%i.service container-volume-backup@%i.timer After=container-volume-restore@%i.service diff --git a/config/service/biboumi/systemd/biboumi.service b/config/service/biboumi/systemd/biboumi.service index 27ce38e..4eac480 100644 --- a/config/service/biboumi/systemd/biboumi.service +++ b/config/service/biboumi/systemd/biboumi.service @@ -1,5 +1,5 @@ [Unit] -Description=Biboumi IRC gateway for XMPP +Description=Biboumi IRC Gateway for XMPP Wants=container-build@%N.service container-volume@%N.service prosody.service After=container-build@%N.service container-volume@%N.service prosody.service diff --git a/config/service/dovecot/systemd/dovecot-firstboot.target b/config/service/dovecot/systemd/dovecot-firstboot.target index fb5f9aa..fa57882 100644 --- a/config/service/dovecot/systemd/dovecot-firstboot.target +++ b/config/service/dovecot/systemd/dovecot-firstboot.target @@ -1,5 +1,5 @@ [Unit] -Description=Initialize Dovecot POP3/IMAP server +Description=Initialize Dovecot POP3/IMAP Server Wants=mariadb-migrate@dovecot.service dovecot.service After=mariadb-migrate@dovecot.service Before=dovecot.service diff --git a/config/service/dovecot/systemd/dovecot.service b/config/service/dovecot/systemd/dovecot.service index 82cc9dc..27c43b7 100644 --- a/config/service/dovecot/systemd/dovecot.service +++ b/config/service/dovecot/systemd/dovecot.service @@ -1,5 +1,5 @@ [Unit] -Description=Dovecot POP3/IMAP server +Description=Dovecot POP3/IMAP Server Wants=container-build@%N.service container-volume@%N.service mariadb.service rspamd.service After=container-build@%N.service container-volume@%N.service mariadb.service rspamd.service diff --git a/config/service/git/systemd/git-ssh-ed25519@.service b/config/service/git/systemd/git-ssh-ed25519@.service index 4141c10..c123340 100644 --- a/config/service/git/systemd/git-ssh-ed25519@.service +++ b/config/service/git/systemd/git-ssh-ed25519@.service @@ -1,5 +1,5 @@ [Unit] -Description=Git SSH authentication via ed25519 key %I +Description=Git SSH Authentication via ed25519 Key %I Wants=git.service After=git.service diff --git a/config/service/git/systemd/git-ssh-github@.service b/config/service/git/systemd/git-ssh-github@.service index 9ae3788..728c868 100644 --- a/config/service/git/systemd/git-ssh-github@.service +++ b/config/service/git/systemd/git-ssh-github@.service @@ -1,5 +1,5 @@ [Unit] -Description=Git SSH authentication via key for Github user %I +Description=Git SSH Authentication via Key for Github User %I Wants=git.service After=git.service diff --git a/config/service/git/systemd/git.service b/config/service/git/systemd/git.service index 8b81021..fc36784 100644 --- a/config/service/git/systemd/git.service +++ b/config/service/git/systemd/git.service @@ -1,5 +1,5 @@ [Unit] -Description=Git server over SSH +Description=Git Server Wants=container-build@%N.service container-volume@%N.service After=container-build@%N.service container-volume@%N.service @@ -8,8 +8,8 @@ Type=notify NotifyAccess=all Restart=on-failure Environment=PODMAN_SYSTEMD_UNIT=%n -ExecStart=/bin/podman run --replace --pull never --net internal --name %N \ - --sdnotify=conmon --cap-add AUDIT_WRITE \ +ExecStart=/bin/podman run --replace --pull never --net internal --name %N --sdnotify=conmon \ + --cap-add AUDIT_WRITE \ --publish 468:22 \ --volume %N:/var/lib/git:z \ --volume %N-ssh:/etc/ssh/keys:z \ diff --git a/config/service/mariadb/systemd/mariadb-migrate@.service b/config/service/mariadb/systemd/mariadb-migrate@.service index 206bf65..02dabe6 100644 --- a/config/service/mariadb/systemd/mariadb-migrate@.service +++ b/config/service/mariadb/systemd/mariadb-migrate@.service @@ -1,5 +1,5 @@ [Unit] -Description=MariaDB SQL migration for %I +Description=MariaDB SQL Migration for %I Wants=container-environment@%i.service mariadb.service After=container-environment@%i.service mariadb.service ConditionPathExists=%E/coreos-home-server/%i/service/%p.sql diff --git a/config/service/nginx/systemd/nginx-proxy-http@.service b/config/service/nginx/systemd/nginx-proxy-http@.service index 739ae78..1320844 100644 --- a/config/service/nginx/systemd/nginx-proxy-http@.service +++ b/config/service/nginx/systemd/nginx-proxy-http@.service @@ -1,5 +1,5 @@ [Unit] -Description=NGINX HTTP/S proxy for %I +Description=NGINX HTTP/S Proxy for %I Wants=nginx.service %i.service After=nginx.service %i.service diff --git a/config/service/nginx/systemd/nginx-serve-php@.service b/config/service/nginx/systemd/nginx-serve-php@.service index dd89afe..dd6f258 100644 --- a/config/service/nginx/systemd/nginx-serve-php@.service +++ b/config/service/nginx/systemd/nginx-serve-php@.service @@ -1,5 +1,5 @@ [Unit] -Description=NGINX PHP web service for %I +Description=NGINX PHP Web Service for %I Wants=container-build@%i.service container-volume@%i.service nginx.service nginx-proxy-http@%i.service After=container-build@%i.service container-volume@%i.service nginx.service Before=nginx-proxy-http@%i.service diff --git a/config/service/nginx/systemd/nginx-serve-static@.service b/config/service/nginx/systemd/nginx-serve-static@.service index 10550f8..8a583a0 100644 --- a/config/service/nginx/systemd/nginx-serve-static@.service +++ b/config/service/nginx/systemd/nginx-serve-static@.service @@ -1,5 +1,5 @@ [Unit] -Description=NGINX static web service for %I +Description=NGINX Static Web Service for %I Wants=container-build@%i.service nginx.service nginx-proxy-http@%i.service After=container-build@%i.service nginx.service Before=nginx-proxy-http@%i.service diff --git a/config/service/nginx/systemd/nginx.service b/config/service/nginx/systemd/nginx.service index 4b0db47..6f2849c 100644 --- a/config/service/nginx/systemd/nginx.service +++ b/config/service/nginx/systemd/nginx.service @@ -1,5 +1,5 @@ [Unit] -Description=NGINX web server +Description=NGINX Web Server Wants=container-build@%N.service After=container-build@%N.service diff --git a/config/service/prosody/systemd/prosody-firstboot.target b/config/service/prosody/systemd/prosody-firstboot.target index d573bf8..5179eb8 100644 --- a/config/service/prosody/systemd/prosody-firstboot.target +++ b/config/service/prosody/systemd/prosody-firstboot.target @@ -1,5 +1,5 @@ [Unit] -Description=Initialize Prosody XMPP server +Description=Initialize Prosody XMPP Server Wants=mariadb-migrate@prosody.service prosody.service After=mariadb-migrate@prosody.service Before=prosody.service diff --git a/config/service/radicale/systemd/radicale.service b/config/service/radicale/systemd/radicale.service index 1ee1f27..95b0f53 100644 --- a/config/service/radicale/systemd/radicale.service +++ b/config/service/radicale/systemd/radicale.service @@ -1,5 +1,5 @@ [Unit] -Description=Radicale CalDAV and CardDAV server +Description=Radicale CalDAV and CardDAV Server Wants=container-build@%N.service container-volume@%N.service dovecot.service After=container-build@%N.service container-volume@%N.service dovecot.service diff --git a/config/service/rspamd/systemd/rspamd-dkim-generate@.service b/config/service/rspamd/systemd/rspamd-dkim-generate@.service index 45d2f40..d440f64 100644 --- a/config/service/rspamd/systemd/rspamd-dkim-generate@.service +++ b/config/service/rspamd/systemd/rspamd-dkim-generate@.service @@ -1,5 +1,5 @@ [Unit] -Description=DKIM key for %I +Description=DKIM Key for %I Wants=rspamd.service After=rspamd.service diff --git a/config/service/rspamd/systemd/rspamd.service b/config/service/rspamd/systemd/rspamd.service index b6c5c90..cf851cc 100644 --- a/config/service/rspamd/systemd/rspamd.service +++ b/config/service/rspamd/systemd/rspamd.service @@ -1,5 +1,5 @@ [Unit] -Description=Rspamd spam filtering system +Description=RSpamd Spam Filtering System Wants=container-build@%N.service container-volume@%N.service redis.service After=container-build@%N.service container-volume@%N.service redis.service