tried new mc location

prebuilt open web calendar image
merging with master with no buld version
2021-05-25 18:03:08 +02:00 · 2021-05-22 17:08:24 +02:00 · 2021-05-21 15:28:53 +02:00 · 2021-05-05 20:07:53 +02:00
57 changed files with 941 additions and 6687 deletions
@@ -1,5 +0,0 @@
-patreon: marcpartensky
-github: marcpartensky
-custom:
-  # - monero:43J2XmRtjDPRLD35UsYGH2AZamFBQz7dt4VdvZXVm3SuadTrvcoXUXBRUNHqukFte23Q5TWXqhbwaLJJgoVQzzbe2AJDANQ
-  - https://paypal.me/marcpartensky
@@ -1,20 +0,0 @@
-name: Docker Swarm Deployed
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - v*
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Update
-        run: apt-get update
-      - name: Install ssh
-        run: apt-get install openssh-client -y
-      - name: Setup ssh agent
-        run: eval $(ssh-agent -s) && ssh-add <(echo $SSH_PRIVATE_KEY)
-      - name: Deploy to Docker swarm
-        run: ssh -o StrictHostKeyChecking=no $SSH_REMOTE docker swarm deploy -c vps.yml vps
@@ -1,12 +1,3 @@
-docker-compose.yml
-data/openvpn
-data/secrets
-data/certbot
-data/traefik
-data/searx
-data/jenkins
-data/beef
-data/tmate/keys
-data/mx-puppet-discord
-data/matrix
-data.tar.gz
+data/secrets/
+data/certbot/
+data/traefik/
@@ -1,18 +0,0 @@
-image: docker:stable
-
-stages:
-    - deploy
-
-services:
-  - docker:dind
-
-before_script:
-  - apk update
-  - apk add py-pip python3-dev libffi-dev openssl-dev gcc libc-dev make
-  - pip install docker-compose
-
-deploy_app:
-    stage: deploy
-    script:
-        - docker-compose down
-        - docker-compose up -d
@@ -1,11 +0,0 @@
-FROM docker:dood
-
-# RUN  curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-# RUN chmod +x /usr/local/bin/docker-compose
-COPY docker-compose.yml docker-compose.yml
-COPY vps.yml vps.yml
-
-RUN docker stack deploy -c vps.yml vps
-
-ENTRYPOINT ["docker"]
-CMD ["service", "ls"]
@@ -1,14 +0,0 @@
-compose:
-	cat ./env/vps.txt | xargs ./bin/docker-setup.sh
-swarm:
-	cat ./env/vps.txt | STACK=vps xargs ./bin/docker-setup.sh
-merge:
-	./bin/setup.sh merge vps
-down:
-	docker stack rm vps
-export:
-	tar cvzf data.tgz data
-	gpg --encrypt --recipient 'marc.partensky@gmail.com' data.tgz
-	rm data.tgz
-network:
-	docker network create --driver overlay --attachable caddy
@@ -1,9 +1,8 @@
-[![Docker Swarm Deployed](https://github.com/MarcPartensky/Docker/actions/workflows/docker-swarm-deploy.yml/badge.svg)](https://github.com/MarcPartensky/Docker/actions/workflows/docker-swarm-deploy.yml)
-
 # Docker

 ## Domains
 - https://marcpartensky.com
+- https://www.marcpartensky.com
 - https://pandoc.marcpartensky.com
 - https://ialab.marcpartensky.com
 - https://notebook.marcpartensky.com
@@ -11,28 +10,20 @@
 - https://cloud.marcpartensky.com
 - https://wordpress.marcpartensky.com
 - https://git.marcpartensky.com
- https://gitlab.marcpartensky.com
- https://todolist.marcpartensky.com
- https://api.todolist.marcpartensky.com
- https://uml.marcpartensky.com
- https://grafana.marcpartensky.com
- https://prometheus.marcpartensky.com
- https://swarm.marcpartensky.com
- https://auth.marcpartensky.com
-<!-- - https://dns.marcpartensky.com -->
+<!-- - https://dev.marcpartensky.com -->
+<!-- - https://box.marcpartensky.com -->
+<!-- - https://business.marcpartensky.com -->
 <!-- - https://glou.marcpartensky.com -->
 <!-- - https://minecraft.marcpartensky.com -->

-## Reverse proxy
-The `docker-compose.yml` configuration is compatible with the following reverse-proxies:
- traefik
- caddy
- nginx
-
-
-## Deploy the stack
+## Commands
+```sh
+certbot certonly -d newdomain.com -n --standalone
+certbot -d domain name,subdomain.domain name,www.domain name --expand
 ```
-docker stack deploy -c vps.yml vps
+
+```sh
+docker exec -i docker_minecraft_1 rcon-cli
 ```

 ### Links
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-PROJECT_PATH="$PROGRAMS_PATH/docker"
-export COMPOSE_PATH_SEPARATOR=":"
-export COMPOSE_FILE=$(find $PROJECT_PATH/services/*.yml | xargs -I @ echo -n @:)
-export COMPOSE_FILE=${COMPOSE_FILE::-1}
-
-
-if [ "$1" = "-f" ]
-then
-    docker-compose --file $@
-    exit
-fi
-
-if [ -f $PWD/docker-compose.yml ]
-then
-    if [ "$#" = 0 ]
-    then
-        docker-compose ps
-        exit
-    fi
-    docker-compose --file $PWD/docker-compose.yml $@
-    exit
-fi
-
-if [ "$#" = 0 ]
-then
-    docker-compose ps
-    exit
-fi
-
-docker-compose $@
-if [ "$1" = "up" ]
-then
-    if [ "$2" = "-d" ]
-    then
-        docker-compose logs -f ${@: 3}
-    else
-        docker-compose logs -f ${@: 2}
-    fi
-elif [ "$1" = "start" ]
-then
-    docker-compose logs -f ${@: 2}
-elif [ "$1" = "restart" ]
-then
-    docker-compose logs -f ${@: 2}
-fi
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import yaml
-import collections.abc
-
-
-def update(d, u):
-    for k, v in u.items():
-        if isinstance(v, collections.abc.Mapping):
-            d[k] = update(d.get(k, {}), v)
-        else:
-            d[k] = v
-    return d
-
-
-d = {}
-for file in sys.argv[1:]:
-    with open(file, "r") as stream:
-        di = yaml.safe_load(stream)
-        d = update(d, di)
-
-print(yaml.safe_dump(d))
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-if [ $1 = merge ]
-then
-    cat ./env/$2.txt | xargs -I @ echo ./services/@.yml | xargs ./bin/merge.py > ./stacks/docker-compose.yml
-    # export COMPOSE_FILE="$PWD/../docker-compose.yml"
-    exit
-fi
-
-
-if [ -z $STACK ]
-then
-    sep="-f"
-else
-    sep="-c"
-fi
-
-services=$@
-
-config_files() {
-    for service in $services
-    do
-        echo -n "$sep services/$service.yml "
-    done
-}
-
-if [ -z $STACK ]
-then
-    cmd="docker compose $(config_files) up -d"
-else
-    cmd="docker stack deploy $(config_files) $STACK"
-fi
-
-echo $cmd
-eval $cmd
@@ -0,0 +1,18 @@
+FROM ubuntu:latest
+
+# Escape from here if you can
+
+RUN apt-get update
+RUN apt-get install -y openssh-server neovim
+
+RUN service ssh start
+
+# RUN useradd $NAME -p $PASSWORD
+
+# need to:
+# nvim /etc/ssh/sshd_config
+# service ssh restart
+# docker run -it -p 7022:7022 --name box marcpartensky/box
+# maybe change guest passwd
+
+EXPOSE 22
@@ -0,0 +1,47 @@
+version: "3.9"
+services:
+  marc:
+    image: marcpartensky/dotfiles
+    build:
+      context: /root/git/dotfiles
+    networks:
+      - box
+    stdin_open: true
+    tty: true
+
+  samy:
+    # image: marcpartensky/box
+    build:
+      context: .
+      dockerfile: Dockerfile
+    networks:
+      - box
+
+  etienne:
+    # image: marcpartensky/box
+    build:
+      context: .
+      dockerfile: Dockerfile
+    networks:
+      - box
+    stdin_open: true
+    tty: true
+
+  valentin:
+    # image: marcpartensky/box
+    build:
+      context: .
+      dockerfile: Dockerfile
+    networks:
+      - box
+
+  alexandre:
+    # image: marcpartensky/box
+    build:
+      context: .
+      dockerfile: Dockerfile
+    networks:
+      - box
+
+networks:
+  box:
@@ -1 +0,0 @@
-mail._domainkey.marcpartensky.com marcpartensky.com:mail:/etc/opendkim/keys/marcpartensky.com/mail.private
@@ -1 +0,0 @@
-*@marcpartensky.com mail._domainkey.marcpartensky.com
@@ -1,2 +0,0 @@
-127.0.0.1
-localhost
@@ -1,51 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
-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
-----END RSA PRIVATE KEY-----
@@ -1,4 +0,0 @@
-mail._domainkey	IN	TXT	( "v=DKIM1; h=sha256; k=rsa; "
-	  "p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAouPk5YPodxb41YBVY4xdeJGRCzUXSrVYUZc2ukE2HqIqWsivU7vPgBFlclBzMMJVdrt/NAt3NnulzWyQg6V+A8wSYkCNpevGlsp2TvkL8Mcuf1LVGfNScjycJ8nC8LhRgHZZJ876yM97mEK+J4X4k8X1/IWzwUSmOOAB3EpfuQLMVQL8KQh5gyAdvokbnmq+r9VqOyiFbZ03Jz"
-	  "yW+RPMTQxMu2kid+KH336/j5Tvza8ITN3vqZRVfZJjJzCJHvx4iKpWy2iOFxNThlUTbnZ93xFEA+36s+pU2hT22RGN8qzSQFBtIXKEqyNJ4KoJ/X53ukYc4ZSmpRAz/PhxX9eIgurUwKXrSwX5127+eCIanRT4aMYSobuue7IGlHixNI4dmZW4H0kMs5MwDItYzNQfmsv7HDjkfsRhBlFpV5LMES1g4L4rWQ85kKcQYfl60FyReCKrrBGi"
-	  "Fi9H8iEK5gDIgOFJ37qNa3yLolll31YdkhONsFyrOyGrEAcCzRHOa9jq9KEa5p8QyRekG75aGEfGlRMntkM1KAhdyjuyixle3I7SYywqtqJfjAButWJdvhuPf1jWmqzs97AoJZb2mYzgP/ur9sqHR8EBJ8HN9thRgf4QsyxpPTO9tOU+4GtT9YSVSGjXHQ0SnPDAj8YxjOql5RDalmiP91NmAeGUfCbLwUkCAwEAAQ==" )  ; ----- DKIM key mail for marcpartensky.com
@@ -1 +0,0 @@
-marc@marcpartensky.com|{SHA512-CRYPT}$6$G1SLI/9La3kXrkrt$9MdkaLuUEoa2n8mVVZoCwmy0g6MrvlHDL0i2FVrUakAXi3pgPfo/HNz/mLWRFS6nG1oOeP8IMbTGM.JptPR../
@@ -1,16 +0,0 @@
-# first caddyfile
-
-test.marcpartensky.com {
-    redir https://caddyserver.com/docs/caddyfile/patterns
-}
-
-authent.marcpartensky.com {
-    reverse_proxy authentik:9443 {
-        tls internal
-    }
-}
-
-# healthcheck
-# :8080 {
-#     status 200 /
-# }
@@ -1,5 +0,0 @@
-# Please restart ClamAV after changing signatures
-Example-Signature.Ignore-1
-PUA.Win.Trojan.EmbeddedPDF-1
-PUA.Pdf.Trojan.EmbeddedJavaScript-1
-PUA.Pdf.Trojan.OpenActionObjectwithJavascript-1
@@ -1,173 +0,0 @@
-# vim:ft=yaml
-
-## TLS ##
-
-# {% if not SYNAPSE_NO_TLS %}
-
-# tls_certificate_path: "/data/{{ SYNAPSE_SERVER_NAME }}.tls.crt"
-# tls_private_key_path: "/data/{{ SYNAPSE_SERVER_NAME }}.tls.key"
-
-# {% endif %}
-
-## Server ##
-
-server_name: "matrix.marcpartensky.com"
-pid_file: /homeserver.pid
-web_client: False
-soft_file_limit: 0
-# log_config: "{{ SYNAPSE_LOG_CONFIG }}"
-
-## Ports ##
-
-listeners:
-  # Allow configuring in case we want to reverse proxy 8008
-  # using another process in the same container
-  - port: 8008
-    tls: false
-    bind_addresses: ['::']
-    type: http
-    x_forwarded: false
-
-    resources:
-      - names: [client]
-        compress: true
-      - names: [federation]
-        compress: false
-
-## Database ##
-
-# {% if POSTGRES_PASSWORD %}
-# database:
-#   name: "psycopg2"
-#   args:
-#     user: "{{ POSTGRES_USER or "synapse" }}"
-#     password: "{{ POSTGRES_PASSWORD }}"
-#     database: "{{ POSTGRES_DB or "synapse" }}"
-#     host: "{{ POSTGRES_HOST or "db" }}"
-#     port: "{{ POSTGRES_PORT or "5432" }}"
-#     cp_min: 5
-#     cp_max: 10
-# {% else %}
-# database:
-#   name: "sqlite3"
-#   args:
-#     database: "/data/homeserver.db"
-# {% endif %}
-
-## Performance ##
-
-event_cache_size: "10K"
-
-## Ratelimiting ##
-
-rc_messages_per_second: 0.2
-rc_message_burst_count: 10.0
-federation_rc_window_size: 1000
-federation_rc_sleep_limit: 10
-federation_rc_sleep_delay: 500
-federation_rc_reject_limit: 50
-federation_rc_concurrent: 3
-
-## Files ##
-
-media_store_path: "/data/media"
-max_upload_size: "50M"
-max_image_pixels: "32M"
-dynamic_thumbnails: false
-
-# List of thumbnail to precalculate when an image is uploaded.
-thumbnail_sizes:
- width: 32
-  height: 32
-  method: crop
- width: 96
-  height: 96
-  method: crop
- width: 320
-  height: 240
-  method: scale
- width: 640
-  height: 480
-  method: scale
- width: 800
-  height: 600
-  method: scale
-
-url_preview_enabled: False
-max_spider_size: "10M"
-
-## Captcha ##
-
-# {% if SYNAPSE_RECAPTCHA_PUBLIC_KEY %}
-# recaptcha_public_key: "{{ SYNAPSE_RECAPTCHA_PUBLIC_KEY }}"
-# recaptcha_private_key: "{{ SYNAPSE_RECAPTCHA_PRIVATE_KEY }}"
-# enable_registration_captcha: True
-# recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify"
-# {% else %}
-# recaptcha_public_key: "YOUR_PUBLIC_KEY"
-# recaptcha_private_key: "YOUR_PRIVATE_KEY"
-enable_registration_captcha: False
-recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify"
-# {% endif %}
-
-## Turn ##
-
-# {% if SYNAPSE_TURN_URIS %}
-# turn_uris:
-# {% for uri in SYNAPSE_TURN_URIS.split(',') %}    - "{{ uri }}"
-# {% endfor %}
-# turn_shared_secret: "{{ SYNAPSE_TURN_SECRET }}"
-# turn_user_lifetime: "1h"
-# turn_allow_guests: True
-# {% else %}
-turn_uris: []
-turn_shared_secret: "marcsecret"
-turn_user_lifetime: "1h"
-turn_allow_guests: True
-# {% endif %}
-
-## Registration ##
-
-enable_registration: "True"
-registration_shared_secret: "marcregistrationsecret"
-bcrypt_rounds: 12
-allow_guest_access: "True"
-enable_group_creation: true
-
-
-## Metrics ###
-
-# {% if SYNAPSE_REPORT_STATS.lower() == "yes" %}
-# enable_metrics: True
-# report_stats: True
-# {% else %}
-enable_metrics: False
-report_stats: False
-# {% endif %}
-
-## API Configuration ##
-
-# {% if SYNAPSE_APPSERVICES %}
-app_service_config_files:
-  -  "discord-registration.yaml"
-# {% for appservice in SYNAPSE_APPSERVICES %}    - "{{ appservice }}"
-# {% endfor %}
-# {% endif %}
-
-macaroon_secret_key: "marcmacaronsecret"
-expire_access_token: False
-
-## Signing Keys ##
-
-# signing_key_path: "/data/matrix.marcpartensky.com.signing.key"
-old_signing_keys: {}
-key_refresh_interval: "1d" # 1 Day.
-
-# The trusted servers to download signing keys from.
-trusted_key_servers:
-  - server_name: matrix.org
-    verify_keys:
-      "ed25519:auto": "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"
-
-password_config:
-   enabled: true
@@ -1,16 +0,0 @@
-server {
-	listen 25565;
-	server_name mc.marcpartensky.com;
-
-	access_log /var/log/nginx/reverse-access.log;
-	error_log /var/log/nginx/reverse-error.log;
-
-	location / {
-		proxy_pass http://marcpartensky.com:7065;
-		# proxy_redirect off;
-		proxy_set_header Host $host;
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header X-Forwarded-Proto https;
-	}
-}
@@ -1,30 +0,0 @@
-server {
-	listen 443 ssl http2;
-	server_name ialab.marcpartensky.com;
-
-	# ssl keys + letsencrypt
-	ssl_certificate /etc/letsencrypt/live/ialab.marcpartensky.com/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/ialab.marcpartensky.com/privkey.pem;
-
-	include /etc/letsencrypt/options-ssl-nginx.conf;
-	ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-
-	# logs
-	access_log /var/log/nginx/reverse-access.log;
-	error_log /var/log/nginx/reverse-error.log;
-
-
-	location /.well-known/acme-challenge/ {
-		allow all;
-		root /var/www/certbot;
-	}
-
-	location / {
-		proxy_pass http://ialab;
-		# proxy_redirect off;
-		proxy_set_header Host $host;
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header X-Forwarded-Proto https;
-	}
-}
@@ -1,30 +0,0 @@
-server {
-	listen 443 ssl http2;
-	server_name poiret.marcpartensky.com;
-
-	# ssl keys + letsencrypt
-	ssl_certificate /etc/letsencrypt/live/poiret.marcpartensky.com/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/poiret.marcpartensky.com/privkey.pem;
-
-	include /etc/letsencrypt/options-ssl-nginx.conf;
-	ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-
-	# logs
-	access_log /var/log/nginx/reverse-access.log;
-	error_log /var/log/nginx/reverse-error.log;
-
-
-	location /.well-known/acme-challenge/ {
-		allow all;
-		root /var/www/certbot;
-	}
-
-	location / {
-		proxy_pass http://poiret:8000;
-		# proxy_redirect off;
-		proxy_set_header Host $host;
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header X-Forwarded-Proto https;
-	}
-}
@@ -1,30 +0,0 @@
-server {
-	listen 443 ssl http2;
-	server_name vnc.marcpartensky.com;
-
-	# ssl keys + letsencrypt
-	ssl_certificate /etc/letsencrypt/live/vnc.marcpartensky.com/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/vnc.marcpartensky.com/privkey.pem;
-
-	include /etc/letsencrypt/options-ssl-nginx.conf;
-	ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-
-	# logs
-	access_log /var/log/nginx/reverse-access.log;
-	error_log /var/log/nginx/reverse-error.log;
-
-
-	location /.well-known/acme-challenge/ {
-		allow all;
-		root /var/www/certbot;
-	}
-
-	location / {
-		proxy_pass http://vnc:6901;
-		# proxy_redirect off;
-		proxy_set_header Host $host;
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header X-Forwarded-Proto https;
-	}
-}
@@ -1,30 +0,0 @@
-server {
-	listen 443 ssl http2;
-	server_name alex.wp.marcpartensky.com;
-
-	# ssl keys + letsencrypt
-	ssl_certificate /etc/letsencrypt/live/alex.wp.marcpartensky.com/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/alex.wp.marcpartensky.com/privkey.pem;
-
-	include /etc/letsencrypt/options-ssl-nginx.conf;
-	ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-
-	# logs
-	access_log /var/log/nginx/reverse-access.log;
-	error_log /var/log/nginx/reverse-error.log;
-
-
-	location /.well-known/acme-challenge/ {
-		allow all;
-		root /var/www/certbot;
-	}
-
-	location / {
-		proxy_pass http://wordpress_alex;
-		# proxy_redirect off;
-		proxy_set_header Host $host;
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header X-Forwarded-Proto https;
-	}
-}
@@ -1,30 +0,0 @@
-server {
-	listen 443 ssl http2;
-	server_name marc.wp.marcpartensky.com;
-
-	# ssl keys + letsencrypt
-	ssl_certificate /etc/letsencrypt/live/marc.wp.marcpartensky.com/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/marc.wp.marcpartensky.com/privkey.pem;
-
-	include /etc/letsencrypt/options-ssl-nginx.conf;
-	ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-
-	# logs
-	access_log /var/log/nginx/reverse-access.log;
-	error_log /var/log/nginx/reverse-error.log;
-
-
-	location /.well-known/acme-challenge/ {
-		allow all;
-		root /var/www/certbot;
-	}
-
-	location / {
-		proxy_pass http://wordpress_marc;
-		# proxy_redirect off;
-		proxy_set_header Host $host;
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header X-Forwarded-Proto https;
-	}
-}
@@ -0,0 +1 @@
+settings.yml
@@ -0,0 +1,47 @@
+[uwsgi]
+# Who will run the code
+uid = searx
+gid = searx
+
+# Number of workers (usually CPU count)
+workers = 4
+
+# The right granted on the created socket
+chmod-socket = 666
+
+# Plugin to use and interpretor config
+single-interpreter = true
+master = true
+plugin = python3
+lazy-apps = true
+enable-threads = true
+
+# Module to import
+module = searx.webapp
+
+# Virtualenv and python path
+pythonpath = /usr/local/searx/
+chdir = /usr/local/searx/searx/
+
+# Disable logging for privacy
+disable-logging=True
+
+# But keep errors for 2 days
+touch-logrotate = /run/uwsgi-logrotate
+unique-cron = 15 0 -1 -1 -1 { touch /run/uwsgi-logrotate  }
+log-backupname = /var/log/uwsgi/uwsgi.log.1
+logto = /var/log/uwsgi/uwsgi.log
+
+# No keep alive
+# See https://github.com/searx/searx-docker/issues/24
+add-header = Connection: close
+
+# uwsgi serves the static files
+# expires set to one day as Flask does
+static-map = /static=/usr/local/searx/searx/static
+static-expires = /* 864000
+static-gzip-all = True
+offload-threads = %k
+
+# Cache
+cache2 = name=searxcache,items=2000,blocks=2000,blocksize=4096,bitmap=1
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-KEYS_PATH="./data/tmate/keys"
-
-set -eu
-
-gen_key() {
-  keytype=$1
-  ks="${keytype}_"
-  key="$KEYS_PATH/ssh_host_${ks}key"
-  if [ ! -e "${key}" ] ; then
-    ssh-keygen -t "${keytype}" -f "${key}" -N ''
-    echo ""
-  fi
-  SIG=$(ssh-keygen -l -E SHA256 -f "$key.pub" | cut -d ' ' -f 2)
-}
-
-mkdir -p $KEYS_PATH
-gen_key rsa
-RSA_SIG=$SIG
-gen_key ed25519
-ED25519_SIG=$SIG
-
-
-echo "You may use the following settings this in your .tmate.conf:"
-echo ""
-echo "set -g tmate-server-host localhost"
-echo "set -g tmate-server-port 22"
-echo "set -g tmate-server-rsa-fingerprint $RSA_SIG"
-echo "set -g tmate-server-ed25519-fingerprint $ED25519_SIG"
@@ -0,0 +1,734 @@
+version: "3.9"
+services:
+
+  traefik:
+    image: traefik
+    restart: unless-stopped
+    user: root
+    command:
+      ## Provider Settings - https://docs.traefik.io/providers/docker/#provider-configuration ##
+      # - --providers.docker.exposedbydefault=false # <== Don't expose every container to traefik, only expose enabled ones
+      - --providers.file.filename=/dynamic.yaml # <== Referring to a dynamic configuration file
+      # - --providers.docker.network=web # <== Operate on the docker network named web
+      - --providers.docker=true # <== Enabling docker as the provider for traefik
+      ## API Settings - https://docs.traefik.io/operations/api/, endpoints - https://docs.traefik.io/operations/api/#endpoints ##
+      - --api.insecure=true # <== Enabling insecure api, NOT RECOMMENDED FOR PRODUCTION
+      - --api.dashboard=true # <== Enabling the dashboard to view services, middlewares, routers, etc...
+      - --api.debug=true # <== Enabling additional endpoints for debugging and profiling
+      ## Entrypoints Settings - https://docs.traefik.io/routing/entrypoints/#configuration ##
+      - --entrypoints.websecure.address=:443
+      ## Certificate Settings (Let's Encrypt) -  https://docs.traefik.io/https/acme/#configuration-examples ##
+      - --certificatesresolvers.tls.acme.tlschallenge=true # <== Enable TLS-ALPN-01 to generate and renew ACME certs
+      - --certificatesresolvers.tls.acme.email=marc.partensky@gmail.com # <== Setting email for certs
+      - --certificatesresolvers.tls.acme.storage=/letsencrypt/acme.json # <== Defining acme file to store cert information
+      ## Log Settings (options: ERROR, DEBUG, PANIC, FATAL, WARN, INFO) - https://docs.traefik.io/observability/logs/ ##
+      - --log.level=DEBUG # <== Setting the level of the logs from traefik
+    ports:
+      - "8081:443"
+      - "8080:8080" # The Web UI (enabled by --api.insecure=true)
+    volumes:
+      - ./data/traefik/letsencrypt:/letsencrypt
+      - ./data/traefik/dynamic.yaml:/dynamic.yaml
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.api.rule=Host(`traefik.marcpartensky.com`)"
+      - "traefik.http.routers.api.service=api@internal" # <== Enabling the api to be a service to access
+      - "traefik.http.routers.traefik.entrypoints=websecure"
+      - "traefik.http.routers.traefik.tls.certresolver=tls"
+
+  whoami:
+    image: traefik/whoami
+    restart: unless-stopped
+    user: nobody
+    labels:
+      - "traefik.http.routers.whoami.rule=Host(`whoami.marcpartensky.com`)"
+      - "traefik.http.routers.whoami.entrypoints=websecure"
+      - "traefik.http.routers.whoami.tls.certresolver=tls"
+
+  nginx:
+    image: nginx
+    restart: unless-stopped
+    ports:
+      - "80:80"
+      - "443:443"
+      # - "2222:2222"
+    volumes:
+      - ./data/nginx:/etc/nginx/conf.d
+      - /etc/letsencrypt:/etc/letsencrypt
+      - /var/log/nginx:/var/log/nginx
+      # - ./data/certbot/conf:/etc/letsencrypt
+      # - ./data/certbot/www:/var/www/certbot
+      # - type: bind
+      #   source: /home/my-user/elk-stack/.htpasswd
+      #   target: /etc/nginx/.htpasswd
+    command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
+    networks:
+      - nginx
+      - box
+
+  portainer:
+    image: portainer/portainer-ce
+    restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /srv/portainer:/data
+    networks:
+      - nginx
+    command:
+      - --logo
+      - https://marcpartensky.com/static/home/assets/img/white-orchid.svg
+    labels:
+      - "traefik.http.routers.portainer.rule=Host(`docker.marcpartensky.com`)"
+      - "traefik.http.routers.portainer.entrypoints=websecure"
+      - "traefik.http.routers.portainer.tls.certresolver=tls"
+
+  # registry:
+  #   restart: unless-stopped
+  #   image: registry:latest
+  #   ports:
+  #     - 5000:5000
+  #   environment:
+  #     REGISTRY_HTTP_TLS_CERTIFICATE: /certs/domain.crt
+  #     REGISTRY_HTTP_TLS_KEY: /certs/domain.key
+  #     REGISTRY_AUTH: htpasswd
+  #     REGISTRY_AUTH_HTPASSWD_PATH: /auth/htpasswd
+  #     REGISTRY_AUTH_HTPASSWD_REALM: Registry Realm
+  #   volumes:
+  #     - /path/data:/var/lib/registry
+  #     - /path/certs:/certs
+  #     - /path/auth:/auth
+
+  # registry:
+  #   image: registry:latest
+  #   restart: unless-stopped
+  #   volumes:
+  #     - /srv/registry:/var/lib/registry
+  #     - "$(pwd)"/certs:/certs
+  #   ports:
+  #     - "5000:7000"
+  #   environment:
+  #     - REGISTRY_HTTP_ADDR=0.0.0.0:443 \
+  #     - REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt \
+  #     - REGISTRY_HTTP_TLS_KEY=/certs/domain.key \
+  # -p 443:443
+
+  website:
+    image: marcpartensky/website
+    restart: unless-stopped
+    env_file:
+      - ./data/secrets/website.env
+    environment:
+      - DEBUG=false
+      # - KEY=/app/privkey.pem
+      # - CERT=/app/fullchain.pem
+    working_dir: /app
+    tty: true
+    # - ./manage.py collectstatic --noinput
+    entrypoint: >
+      sh -c "./manage.py migrate;
+             ./manage.py createsuperuser --noinput;
+             daphne django_project.asgi:application --port 80 --bind 0.0.0.0 -v2"
+    # entrypoint: "daphne -e ssl:7000:privateKey=$$KEY:certKey=$$CERT django_project.asgi:application"
+    # entrypoint: daphne -b website -e ssl:443:privateKey=/app/privkey.pem:certKey=/app/fullchain.pem django_project.asgi:application
+    links:
+      - redis
+      - postgres
+    volumes:
+      - /srv/website/media:/app/media
+    networks:
+      - website
+      - nginx
+    depends_on:
+      - redis
+      - postgres
+
+  postgres:
+    image: postgres
+    restart: unless-stopped
+    volumes:
+      - /srv/postgres/dump:/srv/postgresql/dump
+    env_file:
+      - data/secrets/postgres.env
+    networks:
+      - website
+
+  redis:
+    image: redis:alpine
+    restart: unless-stopped
+    networks:
+      - website
+
+  # certbot:
+  #   image: certbot/certbot
+  #   volumes:
+  #     - ./data/certbot/conf:/etc/letsencrypt
+  #     - ./data/certbot/www:/var/www/certbot
+  #   entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
+
+  # certbot_nginx:
+  #     restart: unless-stopped
+  #     image: staticfloat/nginx-certbot
+  #     ports:
+  #         - "80:80/tcp"
+  #         - "443:443/tcp"
+  #     environment:
+  #         CERTBOT_EMAIL: marc.partensky@gmail.com
+  #         # variable names are space-separated
+  #         ENVSUBST_VARS: FQDN
+  #         FQDN: marcpartensky.com
+  #     volumes:
+  #       - ./conf.d:/etc/nginx/user.conf.d:ro
+  #       - letsencrypt:/etc/letsencrypt
+
+  esclave:
+    image: marcpartensky/discord-bot
+    restart: unless-stopped
+    networks:
+      - discord
+    env_file:
+      - ./data/secrets/esclave.env
+
+  ia:
+    image: marcpartensky/discord-bot
+    restart: unless-stopped
+    networks:
+      - discord
+    env_file:
+      - ./data/secrets/ia.env
+
+  esclave2:
+    image: marcpartensky/discord-bot
+    restart: unless-stopped
+    env_file:
+      - ./data/secrets/esclave2.env
+    networks:
+      - discord
+    depends_on:
+      - discord_bot_mongo
+
+  discord_bot_mongo:
+    image: mongo
+    restart: unless-stopped
+    networks:
+      - discord
+    env_file:
+      - ./data/secrets/discord_bot_mongo.env
+
+  docker_api:
+    image: marcpartensky/docker-api
+    restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      - discord
+
+  servant:
+    image: marcpartensky/servitor
+    restart: unless-stopped
+
+  pandoc:
+    image: marcpartensky/pandoc-api
+    restart: unless-stopped
+    working_dir: /app
+    env_file:
+      - ./data/secrets/pandoc.env
+    entrypoint: "flask run --host pandoc --port 80"
+    volumes:
+      - /srv/pandoc:/app
+      - /var/log/nginx:/var/log/nginx
+    networks:
+      - nginx
+
+  # https://github.com/itzg/docker-minecraft-server/blob/master/README.md
+  # minecraft_aventure:
+  #   image: itzg/minecraft-server
+  #   restart: always
+  #   environment:
+  #     - TZ=Europe/Paris
+  #     - OPS=MazexRedstone
+  #     - EULA=TRUE
+  #     - ENABLE_AUTOPAUSE=TRUE
+  #     - ENABLE_COMMAND_BLOCK=TRUE
+  #     - MEMORY=2G
+  #     - VERSION=1.13.2
+  #     - ICON=https://cdn.discordapp.com/attachments/507519157387132940/816443237384454144/maxime.png
+  #     - MOTD=Venez jouer sur le serveur de Marc Partensky. Venez! On est bien!
+  #     - WORLD=https://download2342.mediafire.com/89adsak3r96g/xavlx2bmrypq2s0/Across+The+Time+II+-+Time+For+Regrets+%28release+1.0.4%29.zip
+  #     # - MODS=https://www.example.com/mods/mod1.jar,https://www.example.com/mods/mod2.jar
+  #   tty: true
+  #   stdin_open: true
+  #   volumes:
+  #     - /srv/minecraft/data:/data
+  #   ports:
+  #     - "25565:25565"
+
+  minecraft:
+    image: itzg/minecraft-server
+    restart: unless-stopped
+    environment:
+      - TZ=Europe/Paris
+      - EULA=TRUE
+      - OPS=MazexRedstone
+      - ENABLE_COMMAND_BLOCK=TRUE
+      - MEMORY=2G
+      - VERSION=1.16.5
+      - ICON=https://cdn.discordapp.com/attachments/611251401514811392/818288635199225886/server.png
+      - MOTD=Venez jouer sur le serveur de Marc Partensky. Venez! On est bien!
+      - ANNOUNCE_PLAYER_ACHIEVEMENTS=TRUE
+      - LEVEL=Server
+      - ONLINE_MODE=FALSE # no need for an account
+      - DIFFICULTY=hard
+      - VIEW_DISTANCE=32
+      - GID=1002
+      - UID=1002
+      # - WORLD=/srv/minecraft/zip/Server.zip
+      # - SNOOPER_ENABLED=false
+    tty: true
+    stdin_open: true
+    volumes:
+      - ~/.minecraft/minecraft/data/:/data:Z
+    ports:
+      - "25565:25565"
+
+  # pterodactyl:
+  #   restart: unless-stopped
+  #   networks:
+  #     - nginx
+
+  notebook:
+    image: jupyter/base-notebook
+    restart: unless-stopped
+    ports:
+      - "8888:8888"
+    environment:
+    #   - GEN_CERT=yes
+      - JUPYTER_ENABLE_LAB=yes
+      - GRANT_SUDO=yes
+    entrypoint: start.sh jupyter lab --user root
+    # entrypoint: start-notebook.sh \
+    #     --NotebookApp.keyfile=key/0000_key-certbot.pem
+    #     --NotebookApp.certfile=cert/0000_csr-certbot.pem
+    # volumes:
+    #   - /etc/letsencrypt/keys:/home/jovyan/work/key
+    #   - /etc/letsencrypt/csr:/home/jovyan/work/cert
+    #   - /etc/letsencrypt:/etc/letsencrypt
+
+# env:
+  #   image: marcpartensky/env
+  #   ports:
+  #     - "22:7020"
+  #     - "8022:7021"
+  #     volumes:
+
+  # elasticsearch:
+    # image: docker.elastic.co/elasticsearch/elasticsearch:7.11.1
+    # image: docker.elastic.co/elasticsearch/elasticsearch:latest
+    # image: elasticsearch:latest
+    # environment:
+    #   - discovery.type=single-node
+    #   - ES_ENABLE_SECURITY=true
+    # env_file:
+    #   - ./data/secrets/elasticsearch.env
+    # volumes:
+    #   - /srv/elasticsearch/data:/srv/elasticsearch/data
+    #   # - elasticsearch:/usr/share/elasticsearch/data
+    # networks:
+    #   - nginx
+    #   - elk
+    # ports:
+    #   - "9200:9200"
+    #   - "9300:9300"
+    # ulimits:
+    #   memlock:
+    #     soft: -1
+    #     hard: -1
+
+  # kibana:
+    # image: docker.elastic.co/kibana/kibana:latest
+    # image: kibana:latest
+    # ports:
+    #   - "5601:5601"
+    # env_file:
+    #   - ./data/secrets/kibana.env
+    # depends_on:
+    #   - elasticsearch
+    # networks:
+    #   - nginx
+
+  ialab:
+    image: marcpartensky/ialab
+    user: nobody
+    restart: unless-stopped
+    environment:
+      - FLASK_APP=server.py
+      # - FLASK_APP=/app/server.py
+      # - FLASK_APP=/app/wsgi.py
+    # env_file:
+      # - /root/git/ialab/.flaskenv
+    # working_dir: /app
+    entrypoint: flask run --host ialab --port 80
+    # entrypoint: "gunicorn server:app"
+    # entrypoint: "gunicorn --chdir /app server:app"
+    volumes:
+      - /srv/ialab:/app
+    networks:
+      - nginx
+
+  open_web_calendar:
+    image: marcpartensky/open_web_calendar
+    restart: unless-stopped
+    working_dir: /app
+    environment:
+      - HOST=open_web_calendar
+      - PORT=80
+    networks:
+      - nginx
+    entrypoint: python app.py
+
+  # discord_voice_recorder:
+  #   image: drv
+  #   volumes:
+  #     - /srv/discord-voice-recorder/recordings:/usr/src/bot/recordings
+
+  wordpress:
+    image: wordpress
+    restart: unless-stopped
+    networks:
+      - nginx
+      - wordpress
+    env_file:
+      - data/secrets/wordpress.env
+    volumes:
+      - /srv/wordpress:/var/www/html
+    depends_on:
+      - wordpress_mysql
+
+  wordpress_mysql:
+    image: mysql
+    restart: unless-stopped
+    env_file:
+      - data/secrets/wordpress.env
+    networks:
+      - wordpress
+    volumes:
+      - /srv/wordpress_mysql:/var/lib/mysql
+
+  business:
+    image: wordpress
+    restart: unless-stopped
+    networks:
+      - nginx
+      - business
+    env_file:
+      - data/secrets/business.env
+    volumes:
+      - /srv/business:/var/www/html
+    depends_on:
+      - business_mysql
+
+  business_mysql:
+    image: mysql
+    restart: unless-stopped
+    env_file:
+      - data/secrets/business.env
+    networks:
+      - business
+    volumes:
+      - /srv/business_mysql:/var/lib/mysql
+
+  oxivia:
+    image: wordpress
+    restart: unless-stopped
+    env_file:
+      - data/secrets/oxivia.env
+    volumes:
+      - /srv/oxivia:/var/www/html
+      - ./data/wordpress/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini
+    networks:
+      - nginx
+      - oxivia
+    depends_on:
+      - oxivia_mysql
+
+  oxivia_mysql:
+    image: mysql
+    restart: unless-stopped
+    env_file:
+      - data/secrets/oxivia.env
+    ports:
+      - "3307:3306"
+    volumes:
+      - /srv/oxivia_mysql:/var/lib/mysql
+    networks:
+      - oxivia
+
+  samba:
+    image: dperson/samba
+    restart: unless-stopped
+    volumes:
+      - /:/mount
+    ports:
+      - "139:139"
+      - "445:445"
+
+  plantuml:
+    image: plantuml/plantuml-server:tomcat
+    restart: unless-stopped
+    networks:
+      - nginx
+
+  nextcloud:
+    image: nextcloud
+    restart: unless-stopped
+    volumes:
+      - nextcloud:/var/www/html
+    env_file:
+      - ./data/secrets/nextcloud.env
+    networks:
+      - nextcloud
+      - nginx
+    depends_on:
+      - nextcloud_mariadb
+
+  nextcloud_mariadb:
+    image: mariadb
+    restart: unless-stopped
+    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+    volumes:
+      - nextcloud_mariadb:/var/lib/mysql
+    env_file:
+      - ./data/secrets/nextcloud.env
+    networks:
+      - nextcloud
+
+  searx:
+    image: searx/searx
+    restart: unless-stopped
+    volumes:
+      - ./data/searx:/etc/searx
+    # environment:
+    #   - PORT=80
+    #   - BASE_URL=http://localhost:$PORT
+    networks:
+      - nginx
+
+  todolist:
+    image: marcpartensky/je-todoapp-react
+    restart: unless-stopped
+    environment:
+      - PORT=80
+      - SPRING_API_URL=https://api.todolist.marcpartensky.com
+    depends_on:
+      - todolist_api
+    networks:
+      - nginx
+    # entrypoint: ["/bin/sh", "-c", "'SPRING_API_URL=https://api.todolist.marcpartensky.com serve -s build'"]
+
+  todolist_api:
+    image: marcpartensky/je-todoapp-spring-api
+    restart: unless-stopped
+    env_file:
+      - ./data/secrets/todolist.env
+    environment:
+      - PORT=80
+      - POSTGRES_HOST=todolist_db
+    depends_on:
+      - todolist_db
+    networks:
+      - todolist_api
+      - nginx
+
+  todolist_db:
+    image: postgres
+    restart: unless-stopped
+    volumes:
+      - /srv/todolist/db:/var/lib/postgresql/data
+    env_file:
+      - ./data/secrets/todolist.env
+    networks:
+      - todolist_api
+
+  openvpn:
+    image: kylemanna/openvpn
+    restart: unless-stopped
+    cap_add:
+     - NET_ADMIN
+    ports:
+      - "1194:1194/udp"
+    volumes:
+      - /srv/openvpn:/etc/openvpn
+    networks:
+      - nginx
+      - nextcloud
+      - website
+      - wordpress
+      - gitea
+      - elk
+      - box
+      - todolist_api
+      - discord
+
+  watchtower:
+    image: containrrr/watchtower
+    restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ~/.docker/config.json:/config.json
+    networks:
+      - nginx
+    command: --interval 10 --http-api-metrics --http-api-token demotoken --debug docker_prometheus_1 docker_grafana_1
+
+  prometheus:
+    image: prom/prometheus
+    restart: unless-stopped
+    volumes:
+      - ./data/prometheus:/etc/prometheus
+      - /srv/prometheus:/prometheus
+    # ports:
+    #   - "9090:9090"
+    user: root
+    networks:
+      - nginx
+
+  grafana:
+    image: grafana/grafana
+    restart: unless-stopped
+    # ports:
+    #   - "3000:3000"
+    environment:
+      GF_INSTALL_PLUGINS: grafana-clock-panel,grafana-simple-json-datasource
+    user: root
+    volumes:
+      - ./data/grafana:/etc/grafana/provisioning
+      - /srv/grafana:/var/lib/grafana
+    networks:
+      - nginx
+
+  gitea:
+    image: gitea/gitea:1.14.1
+    restart: unless-stopped
+    # user: git
+    environment:
+      - USER=git
+      - USER_UID=1004
+      - USER_GID=1004
+    env_file:
+      - ./data/secrets/gitea.env
+    networks:
+      - gitea
+      - nginx
+    volumes:
+      - /home/git/.ssh/:/data/git/.ssh
+      # - /srv/gitea:/data
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    ports:
+      - "7012:22"
+    depends_on:
+      - gitea_postgres
+
+  gitea_postgres:
+    image: postgres
+    restart: unless-stopped
+    env_file:
+      - ./data/secrets/gitea.env
+    networks:
+      - gitea
+    volumes:
+      - /srv/gitea_postgres:/var/lib/postgresql/data
+
+  archlinux:
+    image: archlinux
+    restart: unless-stopped
+    stdin_open: true
+    tty: true
+    volumes:
+      - /srv/archlinux:/root
+
+  windows:
+    image: mcr.microsoft.com/windows:1903
+    restart: unless-stopped
+    stdin_open: true
+    tty: true
+    volumes:
+      - /srv/windows:/root
+
+  healingpath:
+    image: marcpartensky/brainperformer
+    restart: unless-stopped
+    # user: healingpath
+    env_file: ./data/secrets/healingpath.env
+    networks:
+      - healingpath
+      - nginx
+    depends_on:
+      - healingpath_db
+
+  healingpath_db:
+    image: mysql
+    restart: unless-stopped
+    # user: healingpath
+    env_file: ./data/secrets/healingpath.env
+    volumes:
+      - /srv/healingpath/db:/var/lib/mysql
+    networks:
+      - healingpath
+
+  # jenkins_docker:
+  #   image: docker:dind
+  #   privileged: true
+  #   networks:
+  #     - jenkins
+  #   environment:
+  #     DOCKER_TLS_CERTDIR: certs
+  #   volumes:
+  #     - /srv/jenkins_docker/certs:/certs/client
+  #     - /srv/jenkins_docker/data:/var/jenkins_home
+  #   ports:
+  #     - "2376:2376"
+
+  jenkins:
+    image: jenkins/jenkins:lts
+    privileged: true
+    user: root
+    ports:
+    #   - "8080:8080"
+      - "50000:50000"
+    volumes:
+      - /srv/jenkins:/var/jenkins_home
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /usr/bin/docker:/usr/bin/docker
+    networks:
+      - nginx
+
+  tmate:
+    image: tmate/tmate-ssh-server
+    ports:
+      - "7027:22"
+    volumes:
+      - ~/.ssh:/root/.ssh:ro
+    environment:
+      SSH_KEYS_PATH: ~/.ssh
+      SSH_HOSTNAME: marcpartensky.com
+      SSH_PORT_LISTEN: 22
+
+volumes:
+  letsencrypt:
+  nextcloud:
+  nextcloud_mariadb:
+
+networks:
+  healingpath:
+  nextcloud:
+  website:
+  nginx:
+  wordpress:
+  business:
+  gitea:
+  elk:
+  box:
+  todolist_api:
+  discord:
+  oxivia:
+  # traefik:
@@ -1,10 +0,0 @@
-caddy
-website
-oxivia
-servant
-discord-bot
-docker-api
-ialab
-registry
-portainer
-authentik
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+if ! [ -x "$(command -v docker-compose)" ]; then
+  echo 'Error: docker-compose is not installed.' >&2
+  exit 1
+fi
+
+domains=(marcpartensky.com www.marcpartensky.com)
+rsa_key_size=4096
+data_path="./data/certbot"
+email="" # Adding a valid address is strongly recommended
+staging=0 # Set to 1 if you're testing your setup to avoid hitting request limits
+
+if [ -d "$data_path" ]; then
+  read -p "Existing data found for $domains. Continue and replace existing certificate? (y/N) " decision
+  if [ "$decision" != "Y" ] && [ "$decision" != "y" ]; then
+    exit
+  fi
+fi
+
+
+if [ ! -e "$data_path/conf/options-ssl-nginx.conf" ] || [ ! -e "$data_path/conf/ssl-dhparams.pem" ]; then
+  echo "### Downloading recommended TLS parameters ..."
+  mkdir -p "$data_path/conf"
+  curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf"
+  curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/certbot/ssl-dhparams.pem > "$data_path/conf/ssl-dhparams.pem"
+  echo
+fi
+
+echo "### Creating dummy certificate for $domains ..."
+path="/etc/letsencrypt/live/$domains"
+mkdir -p "$data_path/conf/live/$domains"
+docker-compose run --rm --entrypoint "\
+  openssl req -x509 -nodes -newkey rsa:$rsa_key_size -days 1\
+    -keyout '$path/privkey.pem' \
+    -out '$path/fullchain.pem' \
+    -subj '/CN=localhost'" certbot
+echo
+
+
+echo "### Starting nginx ..."
+docker-compose up --force-recreate -d nginx
+echo
+
+echo "### Deleting dummy certificate for $domains ..."
+docker-compose run --rm --entrypoint "\
+  rm -Rf /etc/letsencrypt/live/$domains && \
+  rm -Rf /etc/letsencrypt/archive/$domains && \
+  rm -Rf /etc/letsencrypt/renewal/$domains.conf" certbot
+echo
+
+
+echo "### Requesting Let's Encrypt certificate for $domains ..."
+#Join $domains to -d args
+domain_args=""
+for domain in "${domains[@]}"; do
+  domain_args="$domain_args -d $domain"
+done
+
+# Select appropriate email arg
+case "$email" in
+  "") email_arg="--register-unsafely-without-email" ;;
+  *) email_arg="--email $email" ;;
+esac
+
+# Enable staging mode if needed
+if [ $staging != "0" ]; then staging_arg="--staging"; fi
+
+docker-compose run --rm --entrypoint "\
+  certbot certonly --webroot -w /var/www/certbot \
+    $staging_arg \
+    $email_arg \
+    $domain_args \
+    --rsa-key-size $rsa_key_size \
+    --agree-tos \
+    --force-renewal" certbot
+echo
+
+echo "### Reloading nginx ..."
+docker-compose exec nginx nginx -s reload
@@ -1,99 +0,0 @@
-version: "3.9"
-
-services:
-  authentik_postgres:
-    image: postgres:alpine
-    restart: unless-stopped
-    volumes:
-      - authentik_postgres:/var/lib/postgresql/data
-    env_file:
-      - ../data/secrets/authentik.env
-    networks:
-      - authentik
-
-  authentik_redis:
-    image: redis:alpine
-    restart: unless-stopped
-    networks:
-      - authentik
-
-  authentik:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.2.1}
-    restart: unless-stopped
-    command: server
-    environment:
-      AUTHENTIK_REDIS__HOST: authentik_redis
-      AUTHENTIK_POSTGRESQL__HOST: authentik_postgres
-      AUTHENTIK_ERROR_REPORTING__ENABLED: "false"
-      AUTHENTIK_DEFAULT_USER_CHANGE_USERNAME: admin
-      # WORKERS: 2
-    volumes:
-      - authentik_media:/media
-      - authentik_templates:/templates
-      - authentik_geoip:/geoip
-    env_file:
-      - ../data/secrets/authentik.env
-    # ports:
-    #   - "0.0.0.0:${AUTHENTIK_PORT_HTTP:-9000}:9000"
-    #   - "0.0.0.0:${AUTHENTIK_PORT_HTTPS:-9443}:9443"
-    depends_on:
-      - authentik_postgres
-      - authentik_redis
-      - authentik_worker
-      - caddy
-    networks:
-      - authentik
-      - caddy
-    labels:
-      caddy: authentik.marcpartensky.com
-      caddy.reverse_proxy: "{{upstreams 9000}}"
-
-  authentik_worker:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.2.1}
-    restart: unless-stopped
-    user: root
-    command: worker
-    environment:
-      AUTHENTIK_REDIS__HOST: authentik_redis
-      AUTHENTIK_POSTGRESQL__HOST: authentik_postgres
-      AUTHENTIK_ERROR_REPORTING__ENABLED: "false"
-    # This is optional, and can be removed. If you remove this, the following will happen
-    # - The permissions for the /backups and /media folders aren't fixed, so make sure they are 1000:1000
-    # - The docker socket can't be accessed anymore
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - authentik_backups:/backups
-      - authentik_media:/media
-      - authentik_certs:/certs
-      - authentik_templates:/templates
-      - authentik_geoip:/geoip
-    env_file:
-      - ../data/secrets/authentik.env
-    networks:
-      - authentik
-
-  authentik_geoipupdate:
-    image: maxmindinc/geoipupdate:latest
-    restart: unless-stopped
-    volumes:
-      - authentik_geoip:/usr/share/GeoIP
-    environment:
-      GEOIPUPDATE_EDITION_IDS: "GeoLite2-City"
-      GEOIPUPDATE_FREQUENCY: "8"
-    # env_file:
-    #   - ../data/secrets/authentik.env
-    networks:
-      - authentik
-
-volumes:
-  authentik_postgres:
-  authentik_backups:
-  authentik_media:
-  authentik_certs:
-  authentik_templates:
-  authentik_geoip:
-
-networks:
-  authentik:
-  caddy:
-    external: true
@@ -1,54 +0,0 @@
-version: "3.9"
-
-configs:
-  caddy-basic-content:
-    file: ../data/caddy/Caddyfile
-    labels:
-      caddy:
-
-services:
-  caddy:
-    image: lucaslorentz/caddy-docker-proxy:ci-alpine
-    ports:
-      - "80:80"
-      - "443:443"
-    environment:
-      CADDY_INGRESS_NETWORKS: caddy
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - caddy_data:/data
-      # - ./data/caddy/Caddyfile:/etc/Caddyfile
-    networks:
-      - caddy
-    logging:
-      # syslog?
-      options:
-        max-size: 5m
-        max-file: "10"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "localhost:80"]
-    deploy:
-      labels: # Global options
-        caddy.email: marc.partensky@gmail.com
-      update_config:
-        parallelism: 1
-        delay: 5s
-        order: start-first
-        failure_action: rollback
-      rollback_config:
-        order: start-first
-      placement:
-        constraints:
-          - node.role == manager
-        # restart_policy:
-        #     condition: any
-      resources:
-        reservations:
-          cpus: '1'
-          memory: 500M
-volumes:
-  caddy_data:
-
-networks:
-  caddy:
-    external: true
@@ -1,47 +0,0 @@
-version: "3.9"
-
-services:
-  discord_bot_mongo:
-    image: mongo
-    restart: unless-stopped
-    volumes:
-      - discord_bot_mongo:/data/db
-    networks:
-      - discord
-    ports:
-      - "27017:27017"
-    env_file:
-      - ../data/secrets/discord_bot_mongo.env
-    # healthcheck:
-    #   test: CMD echo 'db.runCommand("ping").ok' | mongo localhost:27017/test --quiet
-
-  mongo_express:
-    image: mongo-express
-    restart: unless-stopped
-    environment:
-      ME_CONFIG_OPTIONS_EDITORTHEME: "ambiance"
-    env_file:
-      - ../data/secrets/mongo_express.env
-    networks:
-      - discord
-      - caddy
-    depends_on:
-      - discord_bot_mongo
-    labels:
-      caddy: mongo.marcpartensky.com
-      caddy.reverse_proxy: "{{upstreams 8081}}"
-      traefik.enable: "true"
-      traefik.http.routers.mongo.rule: Host(`mongo.marcpartensky.com`)
-      traefik.http.routers.mongo.entrypoints: websecure
-      traefik.http.routers.mongo.tls.certresolver: tls
-      traefik.http.services.mongo.loadbalancer.server.port: 80
-
-volumes:
-  discord_bot_mongo:
-
-networks:
-  discord:
-  caddy:
-    external: true
-    attachable: true
-    driver: overlay
@@ -1,17 +0,0 @@
-version: "3.9"
-
-services:
-  discord-bot:
-    image: marcpartensky/discord-bot
-    restart: unless-stopped
-    ports:
-        - "7010:8000"
-    networks:
-      - discord
-    depends_on:
-      - docker_api
-    env_file:
-      - ../data/secrets/esclave.env
-
-networks:
-  discord:
@@ -1,13 +0,0 @@
-version: "3.9"
-
-services:
-  docker_api:
-    image: marcpartensky/docker-api
-    restart: unless-stopped
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-      - discord
-
-networks:
-  discord:
@@ -1,36 +0,0 @@
-version: "3.9"
-
-services:
-  ialab:
-    image: marcpartensky/ialab
-    user: nobody
-    restart: unless-stopped
-    environment:
-      FLASK_APP: server.py
-    # env_file:
-      # - $HOME/git/ialab/.flaskenv
-    # working_dir: /app
-    entrypoint: flask run --host ialab --port 80
-    # entrypoint: "gunicorn server:app"
-    # entrypoint: "gunicorn --chdir /app server:app"
-    volumes:
-      - ialab:/app
-    networks:
-      - caddy
-    depends_on:
-      - caddy
-    labels:
-      caddy: ialab.marcpartensky.com
-      caddy.reverse_proxy: "{{upstreams}}"
-      traefik.enable: "true"
-      traefik.http.routers.ialab.rule: Host(`ialab.marcpartensky.com`)
-      traefik.http.routers.ialab.entrypoints: websecure
-      traefik.http.routers.ialab.tls.certresolver: tls
-      traefik.http.services.ialab.loadbalancer.server.port: 80
-
-volumes:
-  ialab:
-
-networks:
-  caddy:
-    external: true
@@ -1,22 +0,0 @@
-version: "3.9"
-
-services:
-  jupyterhub:
-    image: jupyterhub/jupyterhub
-    restart: unless-stopped
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      # - jupyterhub:/srv/jupyterhub
-    networks:
-    - caddy
-    environment:
-      DOCKER_JUPYTER_IMAGE: marcpartensky/jupyterlab
-      DOCKER_NETWORK_NAME: jupyterhub
-      HUB_IP: jupyterhub
-    labels:
-      caddy: jupyterhub.marcpartensky.com
-      caddy.reverse_proxy: "{{upstreams 8000}}"
-
-networks:
-  caddy:
-    external: true
@@ -1,33 +0,0 @@
-version: "3.9"
-
-services:
-  jupyterlab:
-    image: marcpartensky/jupyterlab
-    restart: unless-stopped
-    environment:
-    #   - GEN_CERT=yes
-      JUPYTER_ENABLE_LAB: "yes"
-      GRANT_SUDO: "yes"
-    entrypoint: start.sh jupyter lab --user root
-    networks:
-      - caddy
-    labels:
-      caddy: lab.marcpartensky.com
-      caddy.reverse_proxy: "{{upstreams 8888}}"
-      traefik.enable: "true"
-      traefik.http.routers.notebook.rule: Host(`lab.marcpartensky.com`)
-      traefik.http.routers.notebook.entrypoints: websecure
-      traefik.http.routers.notebook.tls.certresolver: tls
-      traefik.http.services.notebook.loadbalancer.server.port: 8888
-# entrypoint: start-notebook.sh \
-    #     --NotebookApp.keyfile=key/0000_key-certbot.pem
-    #     --NotebookApp.certfile=cert/0000_csr-certbot.pem
-    # volumes:
-    #   - /etc/letsencrypt/keys:/home/jovyan/work/key
-    #   - /etc/letsencrypt/csr:/home/jovyan/work/cert
-    #   - /etc/letsencrypt:/etc/letsencrypt
-    #
-
-networks:
-  caddy:
-    external: true
@@ -1,27 +0,0 @@
-version: "3.9"
-
-services:
-  open_web_calendar:
-    image: marcpartensky/open-web-calendar
-    restart: unless-stopped
-    working_dir: /app
-    environment:
-      HOST: open_web_calendar
-      PORT: 80
-    networks:
-      - caddy
-    entrypoint: python app.py
-    depends_on:
-      - caddy
-    labels:
-      caddy: calendar.marcpartensky.com
-      caddy.reverse_proxy: "{{upstreams 80}}"
-      traefik.enable: "true"
-      traefik.http.routers.open_web_calendar.rule: Host(`calendar.marcpartensky.com`)
-      traefik.http.routers.open_web_calendar.entrypoints: websecure
-      traefik.http.routers.open_web_calendar.tls.certresolver: tls
-      traefik.http.services.open_web_calendar.loadbalancer.server.port: 80
-
-networks:
-  caddy:
-    external: true
@@ -1,18 +0,0 @@
-version: "3.9"
-
-services:
-  oxivia_mysql:
-    image: mysql
-    restart: unless-stopped
-    env_file:
-      - ../data/secrets/oxivia.env
-    volumes:
-      - $BIND_MOUNTS/oxivia_mysql:/var/lib/mysql
-    networks:
-      - caddy
-      - oxivia
-
-networks:
-  oxivia:
-  caddy:
-    external: true
@@ -1,32 +0,0 @@
-version: "3.9"
-
-services:
-  oxivia:
-    image: wordpress
-    restart: unless-stopped
-    env_file:
-      - ../data/secrets/oxivia.env
-    volumes:
-      - $BIND_MOUNTS/oxivia:/var/www/html
-      - ../data/wordpress/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini
-    networks:
-      - caddy
-      - oxivia
-    depends_on:
-      - oxivia_mysql
-      - caddy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "localhost:80"]
-    labels:
-      caddy: oxivia.business.marcpartensky.com
-      caddy.reverse_proxy: "{{upstreams}}"
-      traefik.enable: "true"
-      traefik.http.routers.oxivia.rule: Host(`oxivia.business.marcpartensky.com`)
-      traefik.http.routers.oxivia.entrypoints: websecure
-      traefik.http.routers.oxivia.tls.certresolver: tls
-      traefik.http.services.oxivia.loadbalancer.server.port: 80
-
-networks:
-  oxivia:
-  caddy:
-    external: true
@@ -1,30 +0,0 @@
-version: "3.9"
-
-services:
-  pandoc:
-    image: marcpartensky/pandoc-api
-    restart: unless-stopped
-    working_dir: /app
-    env_file:
-      - ../data/secrets/pandoc.env
-    volumes:
-      - pandoc:/app/files
-    labels:
-      caddy: pandoc.marcpartensky.com
-      caddy.reverse_proxy: "{{upstreams 80}}"
-      traefik.enable: "true"
-      traefik.http.routers.pandoc.rule: Host(`pandoc.marcpartensky.com`)
-      traefik.http.routers.pandoc.entrypoints: websecure
-      traefik.http.routers.pandoc.tls.certresolver: tls
-      traefik.http.services.pandoc.loadbalancer.server.port: 80
-    networks:
-      - caddy
-    depends_on:
-      - caddy
-
-volumes:
-  pandoc:
-
-networks:
-  caddy:
-    external: true
@@ -1,37 +0,0 @@
-version: "3.9"
-
-services:
-  portainer:
-    image: portainer/portainer-ce
-    restart: unless-stopped
-    environment:
-      VIRTUAL_HOST: docker.marcpartensky.com
-      VIRTUAL_PORT: 9000
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - portainer:/data
-    networks:
-      - caddy
-    command:
-      - --logo
-      - https://marcpartensky.com/static/home/assets/img/white-orchid.svg
-        # healthcheck:
-        # test: ["CMD", "curl", "-f", "http://localhost:9000"]
-        # test: ["CMD", "portainer", "--healthcheck"]
-    depends_on:
-      - caddy
-    labels:
-      caddy: docker.marcpartensky.com
-      caddy.reverse_proxy: "{{upstreams 9000}}"
-      traefik.enable: "true"
-      traefik.http.routers.portainer.rule: Host(`docker.marcpartensky.com`)"
-      traefik.http.routers.portainer.entrypoints: websecure
-      traefik.http.routers.portainer.tls.certresolver: tls
-      traefik.http.services.portainer.loadbalancer.server.port: 9000
-
-volumes:
-  portainer:
-
-networks:
-  caddy:
-    external: true
@@ -1,39 +0,0 @@
-version: "3.9"
-
-services:
-  registry:
-    restart: unless-stopped
-    image: registry:latest
-    environment:
-      REGISTRY_HTTP_ADDR: 0.0.0.0:80
-      # REGISTRY_HTTP_TLS_CERTIFICATE: /certs/domain.crt
-      # REGISTRY_HTTP_TLS_KEY: /certs/domain.key
-      # REGISTRY_AUTH_HTPASSWD_PATH: /auth/htpasswd
-      # REGISTRY_AUTH_HTPASSWD_REALM: Registry Realm
-    env_file:
-      - ../data/secrets/registry.env
-    volumes:
-      - registry_data:/var/lib/registry
-      - registry_certs:/certs
-      - registry_auth:/auth
-    depends_on:
-      - caddy
-    networks:
-      - caddy
-    labels:
-      caddy: registry.marcpartensky.com
-      caddy.reverse_proxy: "{{upstreams 80}}"
-      traefik.enable: "true"
-      traefik.http.routers.registry.rule: Host(`registry.marcpartensky.com`)
-      traefik.http.routers.registry.entrypoints: websecure
-      traefik.http.routers.registry.tls.certresolver: "tls"
-      traefik.http.services.registry.loadbalancer.server.port: 80
-
-volumes:
-  registry_data:
-  registry_certs:
-  registry_auth:
-
-networks:
-  caddy:
-    external: true
@@ -1,6 +0,0 @@
-version: "3.9"
-
-services:
-  servant:
-    image: marcpartensky/servitor
-    restart: unless-stopped
@@ -1,17 +0,0 @@
-version: "3.9"
-
-services:
-  sslh:
-    image: marcpartensky/sslh
-    networks:
-      - caddy
-      # - bridge
-    ports:
-      - "443:443"
-    command: --tls=caddy:443 --ssh=localhost:7022
-    depends_on:
-      - caddy
-
-networks:
-  caddy:
-    external: true
@@ -1,111 +0,0 @@
-version: "3.9"
-
-services:
-  website:
-    image: marcpartensky/website
-    restart: unless-stopped
-    env_file:
-      - ../data/secrets/website.env
-    environment:
-      VIRTUAL_HOST: marcpartensky.com
-      VIRTUAL_PORT: 80
-      # DEBUG: true
-      # SECURE_SSL_REDIRECT: false
-      # KEY: /app/privkey.pem
-      # CERT: /app/fullchain.pem
-    working_dir: /app
-    entrypoint: >
-      sh -c "./manage.py migrate;
-             ./manage.py collectstatic --noinput;
-             daphne django_project.asgi:application --port 80 --bind 0.0.0.0 -v2"
-    # entrypoint: "daphne -e ssl:443:privateKey=$$KEY:certKey=$$CERT django_project.asgi:application"
-    # entrypoint: daphne -b website -e ssl:443:privateKey=/app/privkey.pem:certKey=/app/fullchain.pem django_project.asgi:application
-    # command:
-    #   - "80"
-    #   - "0.0.0.0"
-    depends_on:
-      - redis
-      - postgres
-      - caddy
-    volumes:
-      - website_media:/app/media
-    networks:
-      - website
-      - caddy
-    labels:
-      caddy: marcpartensky.com, marc.wf, marc.tf
-      caddy.reverse_proxy: "{{upstreams 80}}"
-      # caddy.tls: "internal"
-      traefik.enable: "true"
-      traefik.http.routers.website.rule: "Host(`marcpartensky.com`)"
-      traefik.http.routers.website.entrypoints: "websecure"
-      traefik.http.routers.website.tls.certresolver: "tls"
-      traefik.http.services.website.loadbalancer.server.port: "80"
-    deploy:
-      # mode: global
-      update_config:
-        parallelism: 1
-        delay: 5s
-        order: start-first
-        failure_action: rollback
-      rollback_config:
-        order: start-first
-      resources:
-        reservations:
-          cpus: "1"
-          memory: "500M"
-
-  postgres:
-    image: postgres
-    restart: unless-stopped
-    volumes:
-      - postgres:/var/lib/postgresql/data
-    env_file:
-      - ../data/secrets/postgres.env
-    networks:
-      - website
-
-  pgweb:
-    image: sosedoff/pgweb
-    restart: unless-stopped
-    env_file:
-        - ../data/secrets/postgres.env
-    networks:
-      - website
-      - caddy
-    depends_on:
-      - postgres
-    healthcheck:
-      test: ["CMD", "wget", "-q", "localhost:8081", "-O", "/dev/null"]
-    labels:
-      caddy: db.marcpartensky.com
-      caddy.reverse_proxy: "{{upstreams 8081}}"
-      # caddy.reverse_proxy.header_up.Host: "{upstream_hostport}" # redundant
-      # caddy.reverse_proxy.header_up.X-Real-IP: "{host}"
-      # caddy.reverse_proxy.header_up.X-Forwarded-For: "{host}"  # redundant
-      caddy.basicauth: /* bcrypt
-      caddy.basicauth.admin: JDJhJDEyJDVRUXdqQllCR2dCSEZ0ZUlaVUZTRE95WXpROFdUcFdXSm4wVGE2TmE4cEkxNHc5Si4venJxCg==
-
-  # postgres_adminer:
-  # adminer:
-  #   image: adminer
-  #   restart: unless-stopped
-  #   ports:
-  #     - 8080:8080
-
-  redis:
-    image: redis:alpine
-    restart: unless-stopped
-    networks:
-      - website
-    healthcheck:
-       test: ["CMD", "redis-cli","ping"]
-
-volumes:
-  website_media:
-  postgres:
-
-networks:
-  website:
-  caddy:
-    external: true
@@ -1,46 +0,0 @@
-version: "3.9"
-
-services:
-  wordpress:
-    image: wordpress
-    restart: unless-stopped
-    networks:
-      - caddy
-      - wordpress
-    env_file:
-      - ../data/secrets/wordpress.env
-    volumes:
-      - wordpress:/var/www/html
-    depends_on:
-      - wordpress_mysql
-    labels:
-      - "caddy=wordpress.marcpartensky.com"
-      - "caddy.reverse_proxy={{upstreams}}"
-      - "traefik.enable=true"
-      - "traefik.http.routers.wordpress.rule=Host(`wordpress.marcpartensky.com`)"
-      - "traefik.http.routers.wordpress.entrypoints=websecure"
-      - "traefik.http.routers.wordpress.tls.certresolver=tls"
-      - "traefik.http.services.wordpress.loadbalancer.server.port=80"
-
-  wordpress_mysql:
-    image: mysql
-    restart: unless-stopped
-    env_file:
-      - ../data/secrets/wordpress.env
-    networks:
-      - caddy
-      - wordpress
-    volumes:
-      - wordpress_mysql:/var/lib/mysql
-    healthcheck:
-      test: CMD /bin/sh -c 'mysqladmin ping --user=$MYSQL_USER --password=$MYSQL_PASSWORD'
-
-
-volumes:
-  wordpress:
-  wordpress_mysql:
-
-networks:
-  wordpress:
-  caddy:
-    external: true
Author	SHA1	Message	Date
marc	6beb13e21d	tried new mc location	2021-05-25 18:03:08 +02:00
marc	42611ca3b7	prebuilt open web calendar image	2021-05-22 17:08:24 +02:00
marc	627a6ee08b	merging with master with no buld version	2021-05-21 15:28:53 +02:00
marc	cf8f1ea43b	no build	2021-05-05 20:07:53 +02:00
				`@@ -1 +0,0 @@`
				`mail._domainkey.marcpartensky.com marcpartensky.com:mail:/etc/opendkim/keys/marcpartensky.com/mail.private`
				`@@ -1 +0,0 @@`
				`*@marcpartensky.com mail._domainkey.marcpartensky.com`
				`@@ -1 +0,0 @@`
				`marc@marcpartensky.com\|{SHA512-CRYPT}$6$G1SLI/9La3kXrkrt$9MdkaLuUEoa2n8mVVZoCwmy0g6MrvlHDL0i2FVrUakAXi3pgPfo/HNz/mLWRFS6nG1oOeP8IMbTGM.JptPR../`