wip

.gitignore

@@ -1,3 +1,4 @@
 certs
 wordpress/wordpress
 mobilizon/mobilizon
+gancio/data/gancio.sqlite

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   nginx:
     image: nginx:latest
@@ -13,11 +11,13 @@ services:
     depends_on:
       - wordpress
       - mobilizon
+ #      - gancio
     networks:
       default:
         aliases:
           - wp.lan
           - mz.lan
+  #        - ga.lan
 
   postgres:
     container_name: mobilizon_db
@@ -41,9 +41,8 @@ services:
       dockerfile: Dockerfile
     volumes:
       - "./mobilizon/mobilizon:/app"
-      - "./mobilizon/dev.exs:/app/config/dev.exs"
+      # - "./mobilizon/dev.exs:/app/config/dev.exs"
-      - "./certs/:/app/priv/certs/:ro"
+      - "/etc/ssl/certs:/etc/ssl/certs:ro"
-      - "/etc/ssl/certs/ca-certificates.crt:/app/priv/ca-bundle.crt:ro"
     depends_on:
       - postgres
     environment:
@@ -51,8 +50,8 @@ services:
       DOCKER: "true"
       MOBILIZON_INSTANCE_NAME: Mobilizon Local
       MOBILIZON_INSTANCE_HOST: mz.lan
-      MOBILIZON_INSTANCE_HOST_PORT: 443
+      MOBILIZON_INSTANCE_HOST_PORT: 4000
-      MOBILIZON_INSTANCE_PORT: 443
+      MOBILIZON_INSTANCE_PORT: 4000
       MOBILIZON_INSTANCE_EMAIL: noreply@mobilizon.me
       MOBILIZON_INSTANCE_REGISTRATIONS_OPEN: "true"
       MOBILIZON_DATABASE_PASSWORD: mobilizon
@@ -61,14 +60,29 @@ services:
       MOBILIZON_DATABASE_HOST: postgres
       MOBILIZON_DATABASE_PORT: 5432
       VITE_HOST: 0.0.0.0
-      MOBILIZON_CA_CERT_PATH: "/app/priv/ca-bundle.crt"
+      MOBILIZON_CA_CERT_PATH: "/etc/ssl/certs/ca-certificates.crt"
     command: sh -c "mix phx.server"
     expose:
-      - "443"
+      # - "443"
       - "4000"
     ports:
       - "5173:5173"
 
+  # gancio:
+  #   restart: always
+  #   image: cisti/gancio
+  #   container_name: gancio
+  #   environment:
+  #     - PATH=$PATH:/home/node/.yarn/bin
+  #     - GANCIO_DATA=/home/node/data
+  #     - NODE_ENV=development
+  #     - GANCIO_DB_DIALECT=sqlite
+  #     - GANCIO_DB_STORAGE=./gancio.sqlite
+  #   volumes:
+  #     - ./gancio/data:/home/node/data
+  #   ports:
+  #     - "13120:13120"
+
   wordpress:
     build:
       context: ./wordpress

gancio/data/config.json

@@ -0,0 +1,41 @@
+{
+  "baseurl": "https://ga.lan",
+  "hostname": "ga.lan",
+  "server": {
+    "host": "0.0.0.0",
+    "port": 13120
+  },
+  "log_level": "debug",
+  "log_path": "/home/node/data/logs",
+  "db": {
+    "dialect": "sqlite",
+    "storage": "/home/node/data/gancio.sqlite",
+    "logging": false,
+    "dialectOptions": {
+      "autoJsonMap": true
+    },
+    "retry": {
+      "match": [
+        null,
+        null,
+        null,
+        {},
+        {}
+      ],
+      "max": 15
+    }
+  },
+  "user_locale": "/home/node/data/user_locale",
+  "upload_path": "/home/node/data/uploads",
+  "proxy": {
+    "protocol": "",
+    "hostname": "",
+    "host": "",
+    "port": "",
+    "auth": {
+      "username": "",
+      "password": ""
+    },
+    "headers": {}
+  }
+}

nginx/nginx.conf

@@ -63,7 +63,37 @@ http {
     proxy_set_header X-Forwarded-Proto $scheme;
 
     location / {
-      proxy_pass "https://mobilizon";
+      proxy_pass "http://mobilizon:4000";
     }
   }
+
+  server {
+    server_name ga.lan;
+    listen 80;
+
+    return 301 https://$server_name$request_uri;
+  }
+
+  # server {
+  #   server_name ga.lan;
+  #   listen 443 ssl;
+  #   http2 on;
+
+  #   ssl_certificate /etc/nginx/certs/lan.pem;
+  #   ssl_certificate_key /etc/nginx/certs/lan-key.pem;
+
+  #   client_max_body_size 16m;
+
+  #   proxy_http_version 1.1;
+  #   proxy_set_header Upgrade $http_upgrade;
+  #   proxy_set_header Connection "upgrade";
+  #   proxy_set_header Host $http_host;
+  #   proxy_set_header X-Real-IP $remote_addr;
+  #   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  #   proxy_set_header X-Forwarded-Proto $scheme;
+
+  #   location / {
+  #     proxy_pass "http://gancio:13120";
+  #   }
+  # }
 }

wordpress/Dockerfile

@@ -1,4 +1,4 @@
-FROM wordpress:php8.0
+FROM wordpress:6.5.0-php8.2
 
 # Install packages under Debian
 RUN apt-get update && \