mirror of
https://github.com/deuill/coreos-home-server.git
synced 2024-09-21 05:30:45 +00:00
More fixes for Nginx-backed services
This commit is contained in:
parent
fb7d7eaa22
commit
606da239dc
@ -19,7 +19,7 @@ ExecStartPre=/bin/podman create --replace --pull never --pod %i \
|
||||
--name %i-nginx localhost/nginx:latest
|
||||
ExecStartPre=/bin/sh -c "envsubst '$SERVER_NAME' < ${NGINX_CONF} > /tmp/%i.conf"
|
||||
ExecStartPre=/bin/sh -c "podman cp /tmp/%i.conf %i-nginx:/etc/nginx/conf.d && rm -f /tmp/%i.conf"
|
||||
ExecStart=/bin/sh -c 'podman pod start %i && podman wait %i-php && podman attach --no-stdin %i-php'
|
||||
ExecStart=/bin/sh -c 'podman pod start %i && podman start --attach %i-php'
|
||||
ExecStop=/bin/podman pod stop --time 10 %i
|
||||
ExecStopPost=/bin/podman pod rm --force %i
|
||||
|
||||
|
@ -7,8 +7,12 @@ Before=nginx-ingress-http@%i.service
|
||||
[Service]
|
||||
Restart=always
|
||||
Environment=SERVER_NAME=%i
|
||||
Environment=SERVICE_DATA_DIRECTORY=/data
|
||||
Environment=NGINX_CONF=/etc/container-service/nginx/service/%p.conf.template
|
||||
ExecStartPre=/bin/podman create --replace --pull never --net nginx-ingress --name %i localhost/%i:latest
|
||||
ExecStartPre=/bin/install -d /var/lib/container-service/%i
|
||||
ExecStartPre=/bin/podman create --replace --pull never --net nginx-ingress \
|
||||
--volume /var/lib/container-service/%i:${SERVICE_DATA_DIRECTORY}:z,shared \
|
||||
--name %i localhost/%i:latest
|
||||
ExecStartPre=/bin/sh -c "envsubst '$SERVER_NAME' < ${NGINX_CONF} > /tmp/%i.conf"
|
||||
ExecStartPre=/bin/sh -c "podman cp /tmp/%i.conf %i:/etc/nginx/conf.d && rm -f /tmp/%i.conf"
|
||||
ExecStart=/bin/podman start --attach %i
|
||||
|
@ -6,7 +6,7 @@ After=container-build@%N.service container-network@%N.service mariadb.service po
|
||||
[Service]
|
||||
Restart=always
|
||||
ExecStartPre=/bin/install --owner 101 --group 102 -d /var/lib/container-service/%N
|
||||
ExecStart=/bin/podman run --replace --pull never --net mariadb,%N --env-file /etc/container-service/%N/%N.env \
|
||||
ExecStart=/bin/podman run --replace --pull never --net mariadb,nginx-ingress,%N --env-file /etc/container-service/%N/%N.env \
|
||||
--publish 5222:5222 --publish 5269:5269 --publish 5347:5347 \
|
||||
--volume /var/lib/container-service/%N:/var/lib/%N:z --volume /etc/container-service/%N/service/config:/etc/%N/conf.d:z \
|
||||
--volume /var/lib/container-service/letsencrypt/private:/etc/ssl/private:z \
|
||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user