From e615c1819ec9cf98041d0284b90e307fe8aa5e6a Mon Sep 17 00:00:00 2001
From: sujiba <mail@sujiba.de>
Date: Mon, 6 May 2024 16:13:19 +0200
Subject: [PATCH] feat: added dokuwiki

---
 dokuwiki/docker-compose.yml | 14 ++++++++++++++
 ntfy/README.md              | 32 ++++++++++++++++++++++++++------
 ntfy/server.yml             | 10 +++++-----
 3 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 dokuwiki/docker-compose.yml

diff --git a/dokuwiki/docker-compose.yml b/dokuwiki/docker-compose.yml
new file mode 100644
index 0000000..1a5db93
--- /dev/null
+++ b/dokuwiki/docker-compose.yml
@@ -0,0 +1,14 @@
+---
+services:
+  dokuwiki:
+    image: linuxserver/dokuwiki:latest
+    container_name: dokuwiki
+    environment:
+      - PUID=1001
+      - PGID=1001
+      - TZ=Europe/Berlin
+    ports:
+      - "127.0.0.1:18443:443"
+    volumes:
+      - ./volumes/dokuwiki:/config
+    restart: unless-stopped
diff --git a/ntfy/README.md b/ntfy/README.md
index 9088cf8..32dfea3 100644
--- a/ntfy/README.md
+++ b/ntfy/README.md
@@ -16,14 +16,34 @@
 ```
 
 
+
 ## Config
 ```
+# Start container
+docker compose up -d && docker compose logs -f
+
+# Move config file into ntfy directory
+mv server.yml volumes/ntfy/
+
+# Restart ntfy container
+docker compose restart
+
+# Access the container shell
+docker compose exec -it ntfy sh
+
+# Create a admin
+ntfy user add --role=admin username
+# Create a user and grant read / write access to topic
+ntfy user add --role=user username
+ntfy access username topic rw
+
+# Create web push key pair
+# required for background push notification with webapp
+ntfy webpush keys
+
 # Edit ntfy config
 vi server.yml
 
-# Move file into ntfy directory
-mv server.yml volumes/ntfy
-
-# Start ntfy container
-docker compose up -d
-```
+# Restart ntfy container again
+docker compose restart
+```
\ No newline at end of file
diff --git a/ntfy/server.yml b/ntfy/server.yml
index 8ca5b4a..1f4a5f6 100644
--- a/ntfy/server.yml
+++ b/ntfy/server.yml
@@ -165,10 +165,10 @@ attachment-cache-dir: /var/cache/ntfy/attachments
 # Create web push key pair inside the docker container:
 #   docker compose exec -it ntfy /bin/bash
 #   ntfy webpush keys
-web-push-public-key:
-web-push-private-key:
-web-push-file: /var/cache/ntfy/webpush.db
-web-push-email-address: hostmaster@exmaple.com
+# web-push-public-key:
+# web-push-private-key:
+# web-push-file: /var/cache/ntfy/webpush.db
+# web-push-email-address: hostmaster@exmaple.com
 # web-push-startup-queries:
 
 # If enabled, ntfy can perform voice calls via Twilio via the "X-Call" header.
@@ -229,7 +229,7 @@ enable-login: true
 #
 # iOS users:
 #   If you use the iOS ntfy app, you MUST configure this to receive timely notifications. You'll like want this:
-upstream-base-url: "https://ntfy.sh"
+# upstream-base-url: "https://ntfy.sh"
 #
 # If set, all incoming messages will publish a "poll_request" message to the configured upstream server, containing
 # the message ID of the original message, instructing the iOS app to poll this server for the actual message contents.