From ed1ca6250bafdfb76ae9c01fc0651e47d890f26d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= Date: Tue, 23 Sep 2025 09:55:52 -0400 Subject: [PATCH] wip --- bootc/baremetal/root/etc/libvirt/hooks/qemu.d/.keep | 0 .../etc/containers/systemd/nextcloud-nginx.container | 2 +- .../nextcloud/etc/containers/systemd/nextcloud/nginx.conf | 2 +- flightctl/fleets.yaml | 4 ++-- .../etc/containers/systemd/nextcloud/nextcloud-config.env | 4 ++-- .../sites/paris-wagram/etc/libvirt-hooks/nextcloud/iptables | 4 ++-- .../villeneuve-d-ascq/etc/libvirt-hooks/nextcloud/iptables | 4 ++-- .../etc/containers/systemd/nextcloud/nextcloud-config.env | 4 ++-- .../etc/containers/systemd/nextcloud/nextcloud-config.env | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 bootc/baremetal/root/etc/libvirt/hooks/qemu.d/.keep diff --git a/bootc/baremetal/root/etc/libvirt/hooks/qemu.d/.keep b/bootc/baremetal/root/etc/libvirt/hooks/qemu.d/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/flightctl/apps/nextcloud/etc/containers/systemd/nextcloud-nginx.container b/flightctl/apps/nextcloud/etc/containers/systemd/nextcloud-nginx.container index 88764b0..0dfd10c 100644 --- a/flightctl/apps/nextcloud/etc/containers/systemd/nextcloud-nginx.container +++ b/flightctl/apps/nextcloud/etc/containers/systemd/nextcloud-nginx.container @@ -25,7 +25,7 @@ Volume=/var/lib/nextcloud/data:/var/www/html:z Volume=/etc/containers/systemd/nextcloud/nginx.conf:/etc/nginx/nginx.conf:ro # Health check (equivalent to readiness probe) -HealthCmd=curl -f http://localhost:80/status.php +HealthCmd=curl -f http://localhost:8080/status.php HealthInterval=30s HealthTimeout=10s HealthStartPeriod=30s diff --git a/flightctl/apps/nextcloud/etc/containers/systemd/nextcloud/nginx.conf b/flightctl/apps/nextcloud/etc/containers/systemd/nextcloud/nginx.conf index 7c90c28..0e2b16a 100644 --- a/flightctl/apps/nextcloud/etc/containers/systemd/nextcloud/nginx.conf +++ b/flightctl/apps/nextcloud/etc/containers/systemd/nextcloud/nginx.conf @@ -41,7 +41,7 @@ http { } server { - listen 80; + listen 8080; # set max upload size client_max_body_size 10G; diff --git a/flightctl/fleets.yaml b/flightctl/fleets.yaml index 3cccd67..804b050 100644 --- a/flightctl/fleets.yaml +++ b/flightctl/fleets.yaml @@ -37,10 +37,10 @@ spec: path: /flightctl/apps/odoo/ repository: demo-edge-retail targetRevision: main - - name: edge-vm + - name: vm-nextcloud configType: GitConfigProviderSpec gitRef: - path: /flightctl/apps/edge-vm/ + path: /flightctl/apps/vm-nextcloud/ repository: demo-edge-retail targetRevision: main - name: hyperv-migration diff --git a/flightctl/fleets/baremetal/sites/paris-wagram/etc/containers/systemd/nextcloud/nextcloud-config.env b/flightctl/fleets/baremetal/sites/paris-wagram/etc/containers/systemd/nextcloud/nextcloud-config.env index 32c81ad..a2a7db9 100644 --- a/flightctl/fleets/baremetal/sites/paris-wagram/etc/containers/systemd/nextcloud/nextcloud-config.env +++ b/flightctl/fleets/baremetal/sites/paris-wagram/etc/containers/systemd/nextcloud/nextcloud-config.env @@ -4,9 +4,9 @@ # Nextcloud domain configuration NEXTCLOUD_TRUSTED_DOMAINS=optiplex-7000.itix.fr -OVERWRITEHOST=optiplex-7000.itix.fr +OVERWRITEHOST=optiplex-7000.itix.fr:8080 OVERWRITEPROTOCOL=http -OVERWRITECLIURL=http://optiplex-7000.itix.fr +OVERWRITECLIURL=http://optiplex-7000.itix.fr:8080 # Nextcloud admin credentials NEXTCLOUD_ADMIN_USER=admin diff --git a/flightctl/fleets/baremetal/sites/paris-wagram/etc/libvirt-hooks/nextcloud/iptables b/flightctl/fleets/baremetal/sites/paris-wagram/etc/libvirt-hooks/nextcloud/iptables index 73d0df6..ffdff2d 100644 --- a/flightctl/fleets/baremetal/sites/paris-wagram/etc/libvirt-hooks/nextcloud/iptables +++ b/flightctl/fleets/baremetal/sites/paris-wagram/etc/libvirt-hooks/nextcloud/iptables @@ -1,2 +1,2 @@ --t nat -A PREROUTING -p tcp --dport 80 -d 192.168.2.73 -j DNAT --to-destination 192.168.122.2:80 --t filter -I LIBVIRT_FWI -d 192.168.122.2 -p tcp --dport 80 -m conntrack --ctstate NEW -j ACCEPT +-t nat -A PREROUTING -p tcp --dport 8080 -d 192.168.2.73 -j DNAT --to-destination 192.168.122.2:8080 +-t filter -I LIBVIRT_FWI -d 192.168.122.2 -p tcp --dport 8080 -m conntrack --ctstate NEW -j ACCEPT diff --git a/flightctl/fleets/baremetal/sites/villeneuve-d-ascq/etc/libvirt-hooks/nextcloud/iptables b/flightctl/fleets/baremetal/sites/villeneuve-d-ascq/etc/libvirt-hooks/nextcloud/iptables index afcf7b4..54dc95a 100644 --- a/flightctl/fleets/baremetal/sites/villeneuve-d-ascq/etc/libvirt-hooks/nextcloud/iptables +++ b/flightctl/fleets/baremetal/sites/villeneuve-d-ascq/etc/libvirt-hooks/nextcloud/iptables @@ -1,2 +1,2 @@ --t nat -A PREROUTING -p tcp --dport 80 -d 192.168.2.75 -j DNAT --to-destination 192.168.122.2:80 --t filter -I LIBVIRT_FWI -d 192.168.122.2 -p tcp --dport 80 -m conntrack --ctstate NEW -j ACCEPT +-t nat -A PREROUTING -p tcp --dport 8080 -d 192.168.2.75 -j DNAT --to-destination 192.168.122.2:8080 +-t filter -I LIBVIRT_FWI -d 192.168.122.2 -p tcp --dport 8080 -m conntrack --ctstate NEW -j ACCEPT diff --git a/flightctl/fleets/vm-nextcloud/sites/paris-wagram/etc/containers/systemd/nextcloud/nextcloud-config.env b/flightctl/fleets/vm-nextcloud/sites/paris-wagram/etc/containers/systemd/nextcloud/nextcloud-config.env index 32c81ad..a2a7db9 100644 --- a/flightctl/fleets/vm-nextcloud/sites/paris-wagram/etc/containers/systemd/nextcloud/nextcloud-config.env +++ b/flightctl/fleets/vm-nextcloud/sites/paris-wagram/etc/containers/systemd/nextcloud/nextcloud-config.env @@ -4,9 +4,9 @@ # Nextcloud domain configuration NEXTCLOUD_TRUSTED_DOMAINS=optiplex-7000.itix.fr -OVERWRITEHOST=optiplex-7000.itix.fr +OVERWRITEHOST=optiplex-7000.itix.fr:8080 OVERWRITEPROTOCOL=http -OVERWRITECLIURL=http://optiplex-7000.itix.fr +OVERWRITECLIURL=http://optiplex-7000.itix.fr:8080 # Nextcloud admin credentials NEXTCLOUD_ADMIN_USER=admin diff --git a/flightctl/fleets/vm-nextcloud/sites/villeneuve-d-ascq/etc/containers/systemd/nextcloud/nextcloud-config.env b/flightctl/fleets/vm-nextcloud/sites/villeneuve-d-ascq/etc/containers/systemd/nextcloud/nextcloud-config.env index eca8888..f24b7c7 100644 --- a/flightctl/fleets/vm-nextcloud/sites/villeneuve-d-ascq/etc/containers/systemd/nextcloud/nextcloud-config.env +++ b/flightctl/fleets/vm-nextcloud/sites/villeneuve-d-ascq/etc/containers/systemd/nextcloud/nextcloud-config.env @@ -4,9 +4,9 @@ # Nextcloud domain configuration NEXTCLOUD_TRUSTED_DOMAINS=adlink-dlap-4001.itix.fr -OVERWRITEHOST=adlink-dlap-4001.itix.fr +OVERWRITEHOST=adlink-dlap-4001.itix.fr:8080 OVERWRITEPROTOCOL=http -OVERWRITECLIURL=http://adlink-dlap-4001.itix.fr +OVERWRITECLIURL=http://adlink-dlap-4001.itix.fr:8080 # Nextcloud admin credentials NEXTCLOUD_ADMIN_USER=admin