From ac8f94fdffc983166bb035a4071956a49c9e6051 Mon Sep 17 00:00:00 2001
From: Thomas Dehaeze <dehaeze.thomas@gmail.com>
Date: Wed, 10 Feb 2021 17:59:19 +0100
Subject: [PATCH] Better headings + use personal hugo container

---
 nas.org | 85 +++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 29 deletions(-)

diff --git a/nas.org b/nas.org
index c8c4b10..5991656 100644
--- a/nas.org
+++ b/nas.org
@@ -286,7 +286,7 @@ networks:
     driver: bridge
 #+end_src
 
-** Traefik
+** =traefik= - Application proxy
 #+begin_src yaml
 services:
 #+end_src
@@ -367,7 +367,7 @@ services:
       # - 'traefik.http.middlewares.authelia.forwardauth.authResponseHeaders=Remote-User, Remote-Groups'
 #+end_src
 
-** Homer
+** =homer= - Home page
 #+begin_src yaml
   homer:
     container_name: homer
@@ -526,7 +526,7 @@ services:
       url: "http://192.168.1.56/"
 #+end_src
 
-** Restic
+** =restic= - Automatic online backups
 #+begin_src yaml
   restic:
     container_name: restic
@@ -557,7 +557,7 @@ user = dehaeze.thomas@gmail.com
 pass = <<get-password(passname="nas/rclone_mega_pass")>>
 #+end_src
 
-** Snapraid
+** =snapraid= - Manage local backup with parity disk
 #+begin_src yaml
   snapraid:
     container_name: snapraid
@@ -672,7 +672,7 @@ older-than = 10
 #+end_src
 
 
-** Portainer
+** =portainer= - Manage docker
 #+begin_src yaml
   portainer:
     container_name: portainer
@@ -699,7 +699,7 @@ older-than = 10
       - "traefik.http.services.portainer-svc.loadbalancer.server.port=9000"
 #+end_src
 
-** Wireguard
+** =wireguard= - VPN
 #+begin_src yaml
   wireguard:
     container_name: wireguard
@@ -725,11 +725,11 @@ older-than = 10
       - 51820:51820/udp
 #+end_src
 
-** Gitea
+** =gitea= - Git server
 #+begin_src yaml
   gitea:
     container_name: git
-    image: gitea/gitea:1.12.4
+    image: gitea/gitea:1.13.2
     depends_on:
       - gitea_db
     restart: unless-stopped
@@ -772,7 +772,7 @@ older-than = 10
       - $CONFIGDIR/mariadb:/var/lib/mysql
 #+end_src
 
-** Caddy - Research Pages
+** =caddy= - Research Pages
 #+begin_src yaml
   caddy:
     container_name: caddy
@@ -813,7 +813,7 @@ older-than = 10
 }
 #+end_src
 
-** Caddy - Dotfiles
+** =caddy= - Dotfiles
 #+begin_src yaml
   dotfiles:
     container_name: dotfiles
@@ -852,11 +852,11 @@ older-than = 10
 }
 #+end_src
 
-** Hugo
+** =hugo= - Wiki + Blog
 #+begin_src yaml
   hugo:
     container_name: hugo
-    image: muninn/hugo-caddy
+    image: tdehaeze/hugo-caddy
     restart: unless-stopped
     networks:
       - t2_proxy
@@ -871,7 +871,7 @@ older-than = 10
       - "traefik.http.services.hugo-svc.loadbalancer.server.port=2015"
 #+end_src
 
-** Syncthing
+** =syncthing= - File Synchronization
 #+begin_src yaml
   syncthing:
     container_name: syncthing
@@ -905,11 +905,11 @@ older-than = 10
       - "traefik.http.services.syncthing-svc.loadbalancer.server.port=8384"
 #+end_src
 
-** Miniflux
+** =miniflux= - RSS reader
 #+begin_src yaml
   miniflux:
     container_name: miniflux
-    image: miniflux/miniflux:latest
+    image: miniflux/miniflux
     restart: unless-stopped
     networks:
       - t2_proxy
@@ -945,7 +945,7 @@ older-than = 10
       - $CONFIGDIR/miniflux_db:/var/lib/postgresql/data
 #+end_src
 
-** Home Assistant
+** =homeassistant= - Home Automation
 #+begin_src yaml
   homeassistant:
     container_name: homeassistant
@@ -982,7 +982,7 @@ older-than = 10
       #- "traefik.http.services.homeassistant-svc.loadbalancer.server.port=8123"
 #+end_src
 
-** Jellyfin
+** =jellyfin= - Media server
 #+begin_src yaml
   jellyfin:
     container_name: jellyfin
@@ -1010,7 +1010,7 @@ older-than = 10
       - "traefik.http.services.jellyfin-svc.loadbalancer.server.port=8096"
 #+end_src
 
-** Filebrowser
+** =filebrowser= - Web file browser
 #+begin_src yaml
   filebrowser:
     container_name: filebrowser
@@ -1049,7 +1049,7 @@ older-than = 10
 }
 #+end_src
 
-** Scrutiny
+** =scrutiny= - Hard drive monitoring
 #+begin_src yaml
   scrutiny:
     container_name: scrutiny
@@ -1080,7 +1080,7 @@ older-than = 10
       - 8089:8080
 #+end_src
 
-** Guacamole
+** =guacamole= - Remote connection
 #+begin_src yaml
   guacamole:
     image: oznu/guacamole
@@ -1104,11 +1104,11 @@ older-than = 10
       - "traefik.http.services.guacamole-svc.loadbalancer.server.port=8080"
 #+end_src
 
-** Transmission
+** =transmission= - Torrent server
 #+begin_src yaml
   transmission-openvpn:
     container_name: transmission
-    image: haugene/transmission-openvpn:2.13
+    image: haugene/transmission-openvpn
     restart: unless-stopped
     networks:
       - t2_proxy
@@ -1146,7 +1146,7 @@ older-than = 10
       - "traefik.http.services.transmission-svc.loadbalancer.server.port=9091"
 #+end_src
 
-** Aria2 - Daemon
+** =aria2= - Download daemon
 #+begin_src yaml
   aria2:
     container_name: aria2
@@ -1190,7 +1190,7 @@ min-split-size=1M
 split=16
 #+end_src
 
-** Aria2 - Web UI
+** =aria2-ui= - Download web UI
 #+begin_src yaml
   aria2-ui:
     container_name: aria2-ui
@@ -1209,20 +1209,19 @@ split=16
       - "traefik.http.routers.aria2-rtr.rule=Host(`dl.$DOMAINNAME`)"
       - "traefik.http.routers.aria2-rtr.tls=false"
       - "traefik.http.routers.aria2-rtr.service=aria2-svc"
-      - "traefik.http.routers.aria2-rtr.middlewares=traefik-auth"
       - "traefik.http.services.aria2-svc.loadbalancer.server.port=6880"
 #+end_src
 
-** Deemix
+** =deemix= - Music Download
 #+begin_src yaml
   deemix:
-    image: registry.gitlab.com/bockiii/deemix-docker
     container_name: deemix
+    image: registry.gitlab.com/bockiii/deemix-docker
     restart: unless-stopped
     networks:
       - t2_proxy
     volumes:
-      - /srv/storage/Downloads:/downloads
+      - /srv/storage/Music:/downloads
       - $CONFIGDIR/deemix:/config
     environment:
       - TZ=$TZ
@@ -1235,10 +1234,38 @@ split=16
       - "traefik.http.routers.deemix-rtr.rule=Host(`deemix.$DOMAINNAME`)"
       - "traefik.http.routers.deemix-rtr.tls=true"
       - "traefik.http.routers.deemix-rtr.service=deemix-svc"
-      - "traefik.http.routers.deemix-rtr.middlewares=traefik-auth"
+      # - "traefik.http.routers.deemix-rtr.middlewares=traefik-auth"
       - "traefik.http.services.deemix-svc.loadbalancer.server.port=6595"
 #+end_src
 
+*** =.arl=
+#+begin_src conf :tangle /ssh:thomas@grenoble:~/docker/config/deemix/.arl :noweb yes
+<<get-password(passname="nas/deemix_arl")>>
+#+end_src
+
+** =linkding= - Bookmark manager
+#+begin_src yaml
+  linkding:
+    container_name: linkding
+    image: sissbruecker/linkding:latest
+    restart: unless-stopped
+    networks:
+      - t2_proxy
+    volumes:
+      - $CONFIGDIR/linkding:/etc/linkding/data
+    environment:
+      - TZ=$TZ
+      - PUID=$PUID
+      - PGID=$PGID
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.linkding-rtr.entrypoints=https"
+      - "traefik.http.routers.linkding-rtr.rule=Host(`bm.$DOMAINNAME`)"
+      - "traefik.http.routers.linkding-rtr.tls=true"
+      - "traefik.http.routers.linkding-rtr.service=linkding-svc"
+      - "traefik.http.services.linkding-svc.loadbalancer.server.port=9090"
+#+end_src
+
 * Docker-Compose OLD                                                :noexport:
 ** Transfer.sh
 #+begin_src yaml