diff --git a/flatcar-quickstart2/cl.yaml b/flatcar-quickstart2/cl.yaml index 2c71ab1..b83c4c5 100644 --- a/flatcar-quickstart2/cl.yaml +++ b/flatcar-quickstart2/cl.yaml @@ -2,11 +2,17 @@ variant: flatcar version: 1.1.0 systemd: units: - - name: caddy.service + - name: lb.service enabled: true - contents_local: caddy.service + contents_local: lb/lb.service + # - name: thintz-com.service + # enabled: true + # contents_local: thintz-com/thintz-com.service storage: files: - - path: /var/caddy/Caddyfile + - path: /var/lb/caddy/Caddyfile contents: - local: caddyfile-contents + local: lb/Caddyfile + # - path: /var/caddy/Caddyfile + # contents: + # local: lb/Caddyfile diff --git a/flatcar-quickstart2/ignition.json b/flatcar-quickstart2/ignition.json index 150c04b..30b8aa9 100644 --- a/flatcar-quickstart2/ignition.json +++ b/flatcar-quickstart2/ignition.json @@ -1 +1 @@ -{"ignition":{"version":"3.4.0"},"storage":{"files":[{"path":"/var/caddy/Caddyfile","contents":{"compression":"","source":"data:,localhost%0A%0Arespond%20%22Hello%2C%20again!%22"}}]},"systemd":{"units":[{"contents":"[Unit]\nDescription=NGINX example\nAfter=docker.service\nRequires=docker.service\n[Service]\nTimeoutStartSec=0\nExecStartPre=-/usr/bin/docker rm --force caddy2\nExecStart=/usr/bin/docker run --name caddy2 --pull always --log-driver=journald --net host -v /var/caddy:/etc/caddy docker.io/caddy:2\nExecStop=/usr/bin/docker stop caddy2\nRestart=always\nRestartSec=5s\n[Install]\nWantedBy=multi-user.target","enabled":true,"name":"caddy.service"}]}} +{"ignition":{"version":"3.4.0"},"storage":{"files":[{"path":"/var/lb/caddy/Caddyfile","contents":{"compression":"","source":"data:,localhost%0A%0Arespond%20%22Hello%2C%20again!%22"}}]},"systemd":{"units":[{"contents":"[Unit]\nDescription=NGINX example\nAfter=docker.service\nRequires=docker.service\n[Service]\nTimeoutStartSec=0\nExecStartPre=-/usr/bin/docker rm --force caddy2\nExecStart=/usr/bin/docker run --name caddy2 --pull always --log-driver=journald --net host -v /var/lb/caddy:/etc/caddy docker.io/caddy:2\nExecStop=/usr/bin/docker stop caddy2\nRestart=always\nRestartSec=5s\n[Install]\nWantedBy=multi-user.target","enabled":true,"name":"lb.service"}]}} diff --git a/flatcar-quickstart2/caddyfile-contents b/flatcar-quickstart2/lb/Caddyfile similarity index 100% rename from flatcar-quickstart2/caddyfile-contents rename to flatcar-quickstart2/lb/Caddyfile diff --git a/flatcar-quickstart2/caddy.service b/flatcar-quickstart2/lb/lb.service similarity index 74% rename from flatcar-quickstart2/caddy.service rename to flatcar-quickstart2/lb/lb.service index 132a8b0..1f199b7 100644 --- a/flatcar-quickstart2/caddy.service +++ b/flatcar-quickstart2/lb/lb.service @@ -5,7 +5,7 @@ Requires=docker.service [Service] TimeoutStartSec=0 ExecStartPre=-/usr/bin/docker rm --force caddy2 -ExecStart=/usr/bin/docker run --name caddy2 --pull always --log-driver=journald --net host -v /var/caddy:/etc/caddy docker.io/caddy:2 +ExecStart=/usr/bin/docker run --name caddy2 --pull always --log-driver=journald --net host -v /var/lb/caddy:/etc/caddy docker.io/caddy:2 ExecStop=/usr/bin/docker stop caddy2 Restart=always RestartSec=5s