From 66f16288fc9dea037bd8493f7bd5cff1cafe0c59 Mon Sep 17 00:00:00 2001
From: Luna <git@l4.pm>
Date: Sun, 22 Jan 2023 18:48:42 -0300
Subject: [PATCH] migrate from pubtester.local to pubtester.example.net

close #1
---
 README.md           | 21 +++++++++++++++++++--
 docker-compose.yaml | 26 +++++++++++++-------------
 files/nginx.conf    |  6 +++---
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index ef200a6..c075d39 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,8 @@ mastodon is TODO.
 
 add the following to your `/etc/hosts`
 ```
-127.0.0.1		pleroma.pubtester.local	localhost
-127.0.0.1		pleroma2.pubtester.local	localhost
+127.0.0.1		pleroma.pubtester.example.net		localhost
+127.0.0.1		pleroma2.pubtester.example.net	localhost
 ```
 
 run
@@ -20,3 +20,20 @@ git clone ... && cd pubtester
 ./pleroma_setup.sh
 docker-compose up -d pleroma_web pleroma2_web nginx
 ```
+
+then go to `https://pleroma.pubtester.example.net:20000/main/friends`
+and also `https://pleroma2.pubtester.example.net:20000/main/friends`
+
+## emit new minica certs
+
+this is generally for myself: https://github.com/jsha/minica
+
+`minica -domains 'pubtester.example.net,*.pubtester.example.net'`
+
+
+## wipe everything
+
+```
+sudo rm -rfv ./data
+./pleroma_setup.sh
+```
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 349e9ef..a140e26 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,14 +6,12 @@ services:
     healthcheck:
       test: ['CMD', 'pg_isready', '-U', 'postgres']
     volumes:
-      - ./data/pleroma/postgres14:/var/lib/postgresql/data
+      - ./data/pleroma/postgres15:/var/lib/postgresql/data
     environment:
       - 'POSTGRES_HOST_AUTH_METHOD=trust'
       - 'POSTGRES_USER=pleroma'
       - 'POSTGRES_PASSWORD=very_secure_pleroma_password'
       - 'POSTGRES_DB=pleroma'
-  #pleroma:
-  #  image: git.pleroma.social:5050/pleroma/pleroma:release-2-4-1
 
   pleroma_web:
     image: pleroma_selfbuilt
@@ -39,7 +37,7 @@ services:
       - ./data/pleroma/static:/var/lib/pleroma/static
       - ./files/pleroma.exs:/etc/pleroma/config.exs:ro
     environment:
-      DOMAIN: pleroma.pubtester.local
+      DOMAIN: pleroma.pubtester.example.net
       INSTANCE_NAME: Pleroma/pubtester
       ADMIN_EMAIL: admin@example.com
       NOTIFY_EMAIL: notify@example.com
@@ -55,13 +53,14 @@ services:
     healthcheck:
       test: ['CMD', 'pg_isready', '-U', 'postgres']
     volumes:
-      - ./data/pleroma2/postgres14:/var/lib/postgresql/data
+      - ./data/pleroma2/postgres15:/var/lib/postgresql/data
     environment:
       - 'POSTGRES_HOST_AUTH_METHOD=trust'
       - 'POSTGRES_USER=pleroma'
       - 'POSTGRES_PASSWORD=very_secure_pleroma_password'
       - 'POSTGRES_DB=pleroma'
   pleroma2_web:
+    # use pleroma_source_selfbuilt if patching pleroma
     image: pleroma_selfbuilt
     healthcheck:
       test:
@@ -74,8 +73,6 @@ services:
       - '127.0.0.1:20710:4000'
     build:
       context: .
-      # Feel free to remove or override this section
-      # See 'Build-time variables' in README.md
       args:
         - "UID=1000"
         - "GID=1000"
@@ -83,9 +80,12 @@ services:
     volumes:
       - ./data/pleroma2/uploads:/var/lib/pleroma/uploads
       - ./data/pleroma2/static:/var/lib/pleroma/static
-      - ./files/pleroma.exs:/etc/pleroma/config.exs:ro
+      - ./files/pleroma.exs:/pleroma/config/prod.secret.exs:ro
+      # dev patches
+      #- /home/luna/git/pleroma/lib/pleroma/formatter.ex:/pleroma/lib/pleroma/formatter.ex:ro
+      #- /home/luna/git/pleroma/deps/linkify/lib/linkify/parser.ex:/pleroma/deps/linkify/lib/linkify/parser.ex:ro
     environment:
-      DOMAIN: pleroma2.pubtester.local
+      DOMAIN: pleroma2.pubtester.example.net
       INSTANCE_NAME: Pleroma/pubtester2
       ADMIN_EMAIL: admin@example.com
       NOTIFY_EMAIL: notify@example.com
@@ -163,12 +163,12 @@ services:
     networks:
       default:
         aliases:
-          - pleroma.pubtester.local
-          - pleroma2.pubtester.local
+          - pleroma.pubtester.example.net
+          - pleroma2.pubtester.example.net
     volumes:
       - ./files/nginx.conf:/etc/nginx/nginx.conf:ro
-      - ./pubtester.local/cert.pem:/etc/nginx/cert.pem:ro
-      - ./pubtester.local/key.pem:/etc/nginx/key.pem:ro
+      - ./pubtester.example.net/cert.pem:/etc/nginx/cert.pem:ro
+      - ./pubtester.example.net/key.pem:/etc/nginx/key.pem:ro
     ports:
       - '127.0.0.1:20000:443'
     depends_on:
diff --git a/files/nginx.conf b/files/nginx.conf
index e935995..c5f80e7 100644
--- a/files/nginx.conf
+++ b/files/nginx.conf
@@ -36,7 +36,7 @@ http {
     #    root /mnt/none;
     #    index index.html index.htm;
 
-    #    server_name mastodon.pubtester.local;
+    #    server_name mastodon.pubtester.example.net;
 
     #    absolute_redirect off;
     #    server_name_in_redirect off;
@@ -73,7 +73,7 @@ http {
         root /mnt/none;
         index index.html index.htm;
 
-        server_name pleroma.pubtester.local;
+        server_name pleroma.pubtester.example.net;
 
         absolute_redirect off;
         server_name_in_redirect off;
@@ -98,7 +98,7 @@ http {
         root /mnt/none;
         index index.html index.htm;
 
-        server_name pleroma2.pubtester.local;
+        server_name pleroma2.pubtester.example.net;
 
         absolute_redirect off;
         server_name_in_redirect off;