.gitattributes

@@ -5,5 +5,3 @@ ddclient/ddclient.conf filter=git-crypt diff=git-crypt
 *.env filter=git-crypt diff=git-crypt
 *.override.yml filter=git-crypt diff=git-crypt
 *.secret filter=git-crypt diff=git-crypt
-htaccess filter=git-crypt diff=git-crypt
-id_rsa filter=git-crypt diff=git-crypt

bind9/guiotte.db

@@ -24,6 +24,3 @@ kdoc.guiotte.fr.   IN  CNAME   dm.guiotte.fr.
 sync.guiotte.fr.   IN  CNAME   dm.guiotte.fr.
 pad.guiotte.fr.    IN  CNAME   dm.guiotte.fr.
 home.guiotte.fr.   IN  CNAME   dm.guiotte.fr.
-zotero.guiotte.fr. IN  CNAME   dm.guiotte.fr.
-git.guiotte.fr.    IN  CNAME   dm.guiotte.fr.
-git-old.guiotte.fr.    IN  CNAME   dm.guiotte.fr.

docker-compose.yml

@@ -46,8 +46,7 @@ services:
     environment: *common-environment
     volumes:
       - ./ddclient:/config
-      - ddclient-cache:/run/ddclient-cache
+      - ddclient-cache:/var/cache/ddclient
-      #- ddclient-cache:/var/cache/ddclient
 
 
   money:
@@ -159,14 +158,26 @@ services:
       - lychee-db-pw
 
 
-  zotero-sync:
+        # WIP
-    image: lscr.io/linuxserver/nginx:latest
+        #  zotero:
-    container_name: zotero-sync
+        #    #image: lscr.io/linuxserver/nginx:latest
-    environment: *common-environment
+        #    #image: sashgorokhov/webdav
-    volumes:
+        #    build: zotero
-      - ./zotero-sync:/config
+        #    container_name: zotero
-      - zotero-sync-data:/data
+        #    environment:
-    restart: unless-stopped
+        #      - PUID=1000
+        #      - PGID=1000
+        #      - TZ=Europe/Helsinki
+        #      - USERNAME=user
+        #      - PASSWORD=passwd
+        #    volumes:
+        #      - zotero-data:/data
+        #      #- zotero-data:/media
+        #    restart: unless-stopped
+        #    # https://github.com/linuxserver/docker-baseimage-alpine-nginx/blob/master/Dockerfile
+        #    # https://github.com/linuxserver/docker-nginx/blob/master/Dockerfile
+        #    # https://github.com/sashgorokhov/docker-nginx-webdav/blob/master/Dockerfile
+        #    # XXX: Missing "nginx-extra" in my build?
     
 
   taskserver:
@@ -185,15 +196,13 @@ services:
       - ./taskserver/client_certs:/client_certs
 
 
-  # Not in use anymore
+  slides-notes:
-  # subdomain still activated though
+    build: slides-notes
-  #slides-notes:
+    container_name: slides-notes
-  #  build: slides-notes
+    restart: always
-  #  container_name: slides-notes
+    environment: *common-environment
-  #  restart: always
+    volumes:
-  #  environment: *common-environment
+      - ./slides-notes/slides:/app/slides
-  #  volumes:
-  #    - ./slides-notes/slides:/app/slides
 
 
   nextcloud:
@@ -308,47 +317,10 @@ services:
         #  - 55443:55443
     restart: unless-stopped
 
-  gitea:
-    image: gitea/gitea:latest
-    #build: gitea
-    container_name: gitea
-    restart: unless-stopped
-    environment:
-      <<: *common-environment
-      GITEA__database__DB_TYPE: mysql
-      GITEA__database__HOST: gitea-db:3306
-      GITEA__database__NAME: gitea
-      GITEA__database__USER: gitea
-      GITEA__database__PASSWD: gitea
-      GITEA__service__DISABLE_REGISTRATION: true
-      GITEA__server__DOMAIN: git.guiotte.fr
-      GITEA__server__SSH_DOMAIN: git.guiotte.fr
-      GITEA__server__LANDING_PAGE: explore
-    depends_on:
-      - gitea-db
-    volumes:
-      - gitea-data:/data
-
-
-  gitea-db:
-    image: linuxserver/mariadb:latest
-    container_name: gitea-db
-    restart: unless-stopped
-    environment:
-      <<: *common-environment
-      FILE__MYSQL_ROOT_PASSWORD: /run/secrets/gitea-db-root-pw
-      FILE__MYSQL_PASSWORD: /run/secrets/gitea-db-pw
-      MYSQL_DATABASE: gitea
-      MYSQL_USER: gitea
-    volumes:
-      - gitea-db:/config
-    secrets:
-      - gitea-db-root-pw
-      - gitea-db-pw
-
 
 volumes:
   money-data:
+  zotero-data:
   lychee-db:
   lychee-config:
   lychee-pictures:
@@ -362,10 +334,6 @@ volumes:
   hedgedoc-config:
   hedgedoc-db:
   homeassistant-config:
-  zotero-sync-data:
-  gitea-data:
-  gitea-db:
-
 
 
 secrets:
@@ -385,7 +353,3 @@ secrets:
     file: hedgedoc-db-root-pw.secret
   hedgedoc-db-pw:
     file: hedgedoc-db-pw.secret
-  gitea-db-root-pw:
-    file: gitea-db-root-pw.secret
-  gitea-db-pw:
-    file: gitea-db-pw.secret

ssh/id_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCfkGAQYqBuWSSWvRPZ8lIUNLIKHG7u/gUpDn55cg8QWCKBDmmHd5zqbUNoNcyRZQCcdn9hX05ZuezkYMxEso2p6wz2Qv1Zqt8oZ9z49RcWCIiNNu1DZdyvMdoN9XkBTwSPOEaVurBGHchSiXmB/DI0/wg06L58et5w0MseR5sFKsKOzrQLFW1ZnaC3O9ueQmIiDyWM6zz0XkKWZ4qD7fUop/7sP0+FrhwhjQQziCduNXqBgOa9gHaKYqM0aLL7ZV68QGt/e3X6Wa+ojps6FZqeJL/QCxG1GmgNQzwq/I94/rEz3XzjgcpY0LBMLX0aw/U393q4nL/KFwrNBwvWDJPnmVo3J86x5MXnO0K3mpTxtb8+OyTGNA4t3XNwLy4ZfeYS5zqCUXAmOvMhFEJ75yy5UtYyt+0zQQq4gCDNxbIgqlHHq0sHgwxnW6EDgOxsPIuUiKc+BZIOZUOZqZy59cH+CixtpoW3sv1/RZPRcXWZPRpmXDMp/kY/gUV9z7bBMFs= florent@drmanhattan

zotero-sync/.gitignore

@@ -1,5 +0,0 @@
-keys
-.migrations
-log
-nginx
-php

zotero-sync/nginx/htpasswd

@@ -1 +0,0 @@
-zotero:$apr1$6JZjzNFg$MZi/1Gnb7lrY2BwjNPXDV.

zotero-sync/nginx/site-confs/default.conf

@@ -1,17 +0,0 @@
-server {
-    listen 80;
-
-    client_max_body_size 0;
-
-    location / {
-        root /data;
-
-        dav_methods PUT DELETE MOVE;
-        dav_ext_methods PROPFIND OPTIONS;
-
-        dav_access user:rw group:rw all:r;
-
-        auth_basic "Restricted";
-        auth_basic_user_file /config/nginx/htpasswd;
-    }
-}