deuill/coreos-home-server
1
0
Fork 0
mirror of https://github.com/deuill/coreos-home-server.git synced 2024-09-21 05:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

More fixes for Nginx-backed services

Browse Source
This commit is contained in:
Alex Palaistras 2021-03-28 14:00:17 +01:00
parent fb7d7eaa22
commit 606da239dc
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -31,9 +31,9 @@ deploy-%: $(TMPDIR)host/%/spec.ign
deploy-virtual: $(TMPDIR)images/fedora-coreos-$(VERSION)-qemu.$(ARCH).qcow2.xz $(TMPDIR)host/$(HOST)/spec.ign deploy-virtual: $(TMPDIR)images/fedora-coreos-$(VERSION)-qemu.$(ARCH).qcow2.xz $(TMPDIR)host/$(HOST)/spec.ign
@printf "Preparing virtual environment...\n" @printf "Preparing virtual environment...\n"
$Q $(VIRTINSTALL) --import --name="fcos-$(STREAM)-$(VERSION)-$(ARCH)" --os-variant=fedora32 \ $Q $(VIRTINSTALL) --import --name="fcos-$(STREAM)-$(VERSION)-$(ARCH)" --os-variant=fedora32 \
--graphics=none --vcpus=2 --memory=2048 \ --graphics=none --vcpus=2 --memory=2048 \
--disk="size=10,backing_store=$(TMPDIR)images/fedora-coreos-$(VERSION)-qemu.$(ARCH).qcow2" \ --disk="size=10,backing_store=$(TMPDIR)images/fedora-coreos-$(VERSION)-qemu.$(ARCH).qcow2" \
--qemu-commandline="-fw_cfg name=opt/com.coreos/config,file=$(TMPDIR)host/$(HOST)/spec.ign" --qemu-commandline="-fw_cfg name=opt/com.coreos/config,file=$(TMPDIR)host/$(HOST)/spec.ign"
## Stop and remove virtual environment for CoreOS. ## Stop and remove virtual environment for CoreOS.
destroy-virtual: destroy-virtual:
@ -94,7 +94,7 @@ $(TMPDIR)images/fedora-coreos-$(VERSION)-%:
$(TMPDIR)make.depend: $(shell find $(ROOTDIR) -name '*.fcc' -type f 2>/dev/null) $(TMPDIR)make.depend: $(shell find $(ROOTDIR) -name '*.fcc' -type f 2>/dev/null)
@printf "# Automatic prerequisites for Fedora CoreOS configuration." > $@ @printf "# Automatic prerequisites for Fedora CoreOS configuration." > $@
@printf "$(foreach i,$^,\n$(patsubst $(ROOTDIR)%.fcc,$(TMPDIR)%.ign, \ @printf "$(foreach i,$^,\n$(patsubst $(ROOTDIR)%.fcc,$(TMPDIR)%.ign, \
$(i)): $(addprefix $(TMPDIR)config/, $(shell awk -F '[ ]+local:[ ]*' '/[ ]+local:/ {print $$2}' $(i))))" >> $@ $(i)): $(addprefix $(TMPDIR)config/, $(shell awk -F '[ ]+local:[ ]*' '/[ ]+local:/ {print $$2}' $(i))))" >> $@
# Show help if empty or invalid target has been given. # Show help if empty or invalid target has been given.
.DEFAULT: .DEFAULT:

2
config/service/nginx/systemd/nginx-php@.service
View File

@ -19,7 +19,7 @@ ExecStartPre=/bin/podman create --replace --pull never --pod %i \
--name %i-nginx localhost/nginx:latest --name %i-nginx localhost/nginx:latest
ExecStartPre=/bin/sh -c "envsubst '$SERVER_NAME' < ${NGINX_CONF} > /tmp/%i.conf" 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" 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 ExecStop=/bin/podman pod stop --time 10 %i
ExecStopPost=/bin/podman pod rm --force %i ExecStopPost=/bin/podman pod rm --force %i

6
config/service/nginx/systemd/nginx-static@.service
View File

@ -7,8 +7,12 @@ Before=nginx-ingress-http@%i.service
[Service] [Service]
Restart=always Restart=always
Environment=SERVER_NAME=%i Environment=SERVER_NAME=%i
Environment=SERVICE_DATA_DIRECTORY=/data
Environment=NGINX_CONF=/etc/container-service/nginx/service/%p.conf.template 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 "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" 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 ExecStart=/bin/podman start --attach %i

2
config/service/prosody/systemd/prosody.service
View File

@ -6,7 +6,7 @@ After=container-build@%N.service container-network@%N.service mariadb.service po
[Service] [Service]
Restart=always Restart=always
ExecStartPre=/bin/install --owner 101 --group 102 -d /var/lib/container-service/%N 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 \ --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/%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 \ --volume /var/lib/container-service/letsencrypt/private:/etc/ssl/private:z \

BIN
host/lhr01nuc/lhr01nuc.env.gpg
View File

Binary file not shown.