wiki / docker-compose cleanup

data/nginx/routes/wiki.conf

@@ -0,0 +1,9 @@
+location /wiki/ {
+	proxy_pass http://wiki/wiki/;
+	proxy_buffering off;
+	proxy_http_version 1.1;
+	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	proxy_set_header Upgrade $http_upgrade;
+	proxy_set_header Connection $http_connection;
+	access_log off;
+}

docker-compose.yml

@@ -27,8 +27,6 @@ services:
    POSTGRES_PASSWORD: enter
   volumes:
    - "./data/postgres-minetest:/var/lib/postgresql/data"
-   - "./data/postgres-minetest-backup:/backup"
-   - "./data/postgres-minetest-restore:/restore"
   logging:
    options:
     max-size: 50m
@@ -49,6 +47,15 @@ services:
    options:
     max-size: 50m
 
+ wiki:
+  image: registry.rudin.io/x86/php-pandorabox
+  restart: always
+  volumes:
+   - "./data/wiki:/var/www/html/wiki"
+  logging:
+   options:
+    max-size: 50m
+
  portainer:
   image: portainer/portainer
   restart: always
@@ -70,8 +77,8 @@ services:
    - portainer
   environment:
    VIRTUAL_PORT: 80
-   VIRTUAL_HOST: test.pandorabox.io
-   LETSENCRYPT_HOST: test.pandorabox.io
+   VIRTUAL_HOST: pandorabox.io
+   LETSENCRYPT_HOST: pandorabox.io
    LETSENCRYPT_EMAIL: thomas@rudin.io
   volumes:
    - "./data/nginx/nginx.conf:/etc/nginx/nginx.conf:ro"

psql-mapserver.sh

@@ -0,0 +1 @@
+docker-compose exec postgres psql -U postgres mapserver

psql-tiles.sh

@@ -1 +0,0 @@
-docker-compose exec postgres-tiles psql -U postgres