wip

2 months ago · ed1ca6250b
9 changed files with 14 additions and 14 deletions
--- a/bootc/baremetal/root/etc/libvirt/hooks/qemu.d/.keep
+++ b/bootc/baremetal/root/etc/libvirt/hooks/qemu.d/.keep
--- 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
--- 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;
--- 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
--- 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
--- 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 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 80 -m conntrack --ctstate NEW -j ACCEPT
+-t filter -I LIBVIRT_FWI -d 192.168.122.2 -p tcp --dport 8080 -m conntrack --ctstate NEW -j ACCEPT
--- 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 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 80 -m conntrack --ctstate NEW -j ACCEPT
+-t filter -I LIBVIRT_FWI -d 192.168.122.2 -p tcp --dport 8080 -m conntrack --ctstate NEW -j ACCEPT
--- 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
--- 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
`@ -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 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 80 -m conntrack --ctstate NEW -j ACCEPT`	`-t filter -I LIBVIRT_FWI -d 192.168.122.2 -p tcp --dport 8080 -m conntrack --ctstate NEW -j ACCEPT`