From d8543b6ba5856939217f5d2ecbae80f7c366cf84 Mon Sep 17 00:00:00 2001
From: Trammell Hudson <hudson@trmm.net>
Date: Tue, 3 May 2022 09:38:08 +0000
Subject: [PATCH] rename to hackerspace.zone and fix docker hostnames

---
 README.md                                       |  2 +-
 env.production                                  | 12 ++++++------
 hedgedoc/docker-compose.yaml                    | 12 ++++++------
 keycloak/README.md                              |  2 +-
 keycloak/docker-compose.yaml                    |  1 -
 nextcloud/docker-compose.yaml                   |  3 ++-
 nginx/data/nginx/templates/docs.conf.template   |  4 ++--
 nginx/data/nginx/templates/login.conf.template  |  2 +-
 nginx/data/nginx/templates/social.conf.template |  2 +-
 nginx/docker-compose.yaml                       |  3 +++
 nginx/env.production                            |  1 -
 nginx/setup                                     |  1 +
 12 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 0559afc..b08291d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-
+apt install jq docker-compose
 
 ```
 cd keycloak
diff --git a/env.production b/env.production
index 7a1f328..8e6cab5 100644
--- a/env.production
+++ b/env.production
@@ -1,7 +1,7 @@
-DOMAIN_NAME=example.com
-REALM=spacestation
+DOMAIN_NAME=hackerspace.zone
+REALM=hackerspace
 
-KEYCLOAK_HOSTNAME=login.example.com
-HEDGEDOC_HOSTNAME=docs.example.com
-MASTODON_HOSTNAME=social.example.com
-NEXTCLOUD_HOSTNAME=cloud.example.com
+KEYCLOAK_HOSTNAME=login.hackerspace.zone
+HEDGEDOC_HOSTNAME=docs.hackerspace.zone
+MASTODON_HOSTNAME=social.hackerspace.zone
+NEXTCLOUD_HOSTNAME=cloud.hackerspace.zone
diff --git a/hedgedoc/docker-compose.yaml b/hedgedoc/docker-compose.yaml
index 88c33d0..43d6c58 100644
--- a/hedgedoc/docker-compose.yaml
+++ b/hedgedoc/docker-compose.yaml
@@ -9,7 +9,7 @@ services:
     volumes:
       - ./data/database:/var/lib/postgresql/data
     restart: always
-  app:
+  hedgedoc:
     # Make sure to use the latest release from https://hedgedoc.org/latest-release
     image: quay.io/hedgedoc/hedgedoc:1.9.3
     env_file:
@@ -17,14 +17,14 @@ services:
       - env.production
     environment:
       - CMD_DB_URL=postgres://hedgedoc:password@database:5432/hedgedoc
-      - CMD_DOMAIN=docs.example.com
-        #- CMD_URL_ADDPORT=true
-      - CMD_OAUTH2_USER_PROFILE_URL=https://login.example.com/realms/spacestation/protocol/openid-connect/userinfo
+      - CMD_PROTOCOL_USESSL=true
+      - CMD_DOMAIN=docs.hackerspace.zone
+      - CMD_OAUTH2_AUTHORIZATION_URL=https://login.hackerspace.zone/realms/hackerspace/protocol/openid-connect/auth
+      - CMD_OAUTH2_TOKEN_URL=https://login.hackerspace.zone/realms/hackerspace/protocol/openid-connect/token
+      - CMD_OAUTH2_USER_PROFILE_URL=https://login.hackerspace.zone/realms/hackerspace/protocol/openid-connect/userinfo
       - CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR=preferred_username
       - CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR=name
       - CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR=email
-      - CMD_OAUTH2_TOKEN_URL=https://login.example.com/realms/spacestation/protocol/openid-connect/token
-      - CMD_OAUTH2_AUTHORIZATION_URL=https://login.example.com/realms/spacestation/protocol/openid-connect/auth
       - CMD_OAUTH2_CLIENT_ID=hedgedoc
       - CMD_OAUTH2_PROVIDERNAME=Keycloak
     volumes:
diff --git a/keycloak/README.md b/keycloak/README.md
index dddc739..9961d99 100644
--- a/keycloak/README.md
+++ b/keycloak/README.md
@@ -66,7 +66,7 @@ sudo docker-compose exec -T keycloak \
   -r spacestation \
   -f - <<EOF
 {
-	"clientId": "hedgerow",
+	"clientId": "hedgedoc",
 	"rootUrl": "http://spacestation:3000/",
 	"adminUrl": "http://spacestation:3000/",
 	"redirectUris": [ "http://spacestation:3000/*" ],
diff --git a/keycloak/docker-compose.yaml b/keycloak/docker-compose.yaml
index fb93b06..1730956 100644
--- a/keycloak/docker-compose.yaml
+++ b/keycloak/docker-compose.yaml
@@ -33,6 +33,5 @@ services:
         - ./data/certs:/etc/x509/https
       ports:
         - 8080:8080
-        - 8443:8443
       depends_on:
         - mysql
diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml
index 8185b04..9776420 100644
--- a/nextcloud/docker-compose.yaml
+++ b/nextcloud/docker-compose.yaml
@@ -25,8 +25,9 @@ services:
       POSTGRES_USER: nextcloud
       POSTGRES_PASSWORD: nextcloud
       #NEXTCLOUD_TRUSTED_DOMAINS: "${NEXTCLOUD_HOSTNAME}"
-      NEXTCLOUD_TRUSTED_DOMAINS: cloud.example.com
+      NEXTCLOUD_TRUSTED_DOMAINS: cloud.hackerspace.zone
       NEXTCLOUD_ADMIN_USER: admin
+      OVERWRITEPROTOCOL: https
     volumes:
       - ./data/nextcloud:/var/www/html
     depends_on:
diff --git a/nginx/data/nginx/templates/docs.conf.template b/nginx/data/nginx/templates/docs.conf.template
index f11676b..cf7c025 100644
--- a/nginx/data/nginx/templates/docs.conf.template
+++ b/nginx/data/nginx/templates/docs.conf.template
@@ -32,7 +32,7 @@ server {
 	chunked_transfer_encoding on;
 
 	location / {
-		proxy_pass http://spacestation:3000;
+		proxy_pass http://host.docker.internal:3000;
 		proxy_set_header Host $host;
 		proxy_set_header X-Real-IP $remote_addr;
 		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -40,7 +40,7 @@ server {
 	}
 
         location /socket.io/ {
-                proxy_pass http://spacestation:3000;
+                proxy_pass http://host.docker.internal:3000;
                 proxy_set_header Host $host; 
                 proxy_set_header X-Real-IP $remote_addr; 
                 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 
diff --git a/nginx/data/nginx/templates/login.conf.template b/nginx/data/nginx/templates/login.conf.template
index cdc918e..15b7f43 100644
--- a/nginx/data/nginx/templates/login.conf.template
+++ b/nginx/data/nginx/templates/login.conf.template
@@ -11,7 +11,7 @@ server {
 	client_max_body_size 128m;
 
 	location / {
-		proxy_pass http://spacestation:8080;
+		proxy_pass http://host.docker.internal:8080;
 		proxy_pass_header Set-Cookie;
 		proxy_set_header Host $host;
 		proxy_set_header X-Forwarded-For $remote_addr;
diff --git a/nginx/data/nginx/templates/social.conf.template b/nginx/data/nginx/templates/social.conf.template
index d8aa47d..a2957ec 100644
--- a/nginx/data/nginx/templates/social.conf.template
+++ b/nginx/data/nginx/templates/social.conf.template
@@ -11,7 +11,7 @@ server {
 	client_max_body_size 128m;
 
 	location / {
-		proxy_pass http://spacestation:6001;
+		proxy_pass http://host.docker.internal:6001;
 		proxy_set_header Host $host;
 		proxy_set_header X-Forwarded-For $remote_addr;
 		proxy_set_header X-Forwarded-Proto https;
diff --git a/nginx/docker-compose.yaml b/nginx/docker-compose.yaml
index b1175b4..7a71b60 100644
--- a/nginx/docker-compose.yaml
+++ b/nginx/docker-compose.yaml
@@ -14,6 +14,9 @@ services:
     env_file:
       -  ../env.production
       -  env.production
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
   certbot:
     image: certbot/certbot
     volumes:
diff --git a/nginx/env.production b/nginx/env.production
index d7bb678..e69de29 100644
--- a/nginx/env.production
+++ b/nginx/env.production
@@ -1 +0,0 @@
-DOMAIN_NAME=example.com
diff --git a/nginx/setup b/nginx/setup
index 9b5bfeb..583f466 100755
--- a/nginx/setup
+++ b/nginx/setup
@@ -6,6 +6,7 @@ if [ ! -r "$ENV" ]; then
 	die "$ENV: not found?"
 fi
 
+source ../env.production
 source env.production
 
 if [ -z "${DOMAIN_NAME}" ]; then