From 34bcf3201705c008ca35a851d8ce4d97be9ed83a Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Mon, 7 Mar 2022 10:13:04 +0100 Subject: [PATCH] use tls --- .drone.yml | 2 +- compose.yml | 3 ++- docs/apps/email.md | 22 ---------------------- docs/apps/foodsoft.md | 32 -------------------------------- docs/apps/mobilizon.md | 10 ---------- docs/apps/nextcloud.md | 4 +--- docs/apps/onlyoffice.md | 7 +------ 7 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 docs/apps/email.md delete mode 100644 docs/apps/foodsoft.md delete mode 100644 docs/apps/mobilizon.md diff --git a/.drone.yml b/.drone.yml index 451d79b..7cc6393 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,7 @@ steps: stack: "lit-docs" deploy_key: from_secret: drone_deploy_key - host: "local-it.lit" + host: "docs.local-it.org" user: "root" port: 22 environment: diff --git a/compose.yml b/compose.yml index 4d003af..a277c24 100644 --- a/compose.yml +++ b/compose.yml @@ -20,7 +20,8 @@ services: - "traefik.enable=true" - "traefik.http.services.lit_docs.loadbalancer.server.port=8000" - "traefik.http.routers.lit_docs.rule=Host(`docs.local-it.org`)" - - "traefik.http.routers.lit_docs.entrypoints=web" + - "traefik.http.routers.lit_docs.entrypoints=web-secure" + - "traefik.http.routers.lit_docs.tls.certresolver=production" networks: proxy: diff --git a/docs/apps/email.md b/docs/apps/email.md deleted file mode 100644 index 2da0c7d..0000000 --- a/docs/apps/email.md +++ /dev/null @@ -1,22 +0,0 @@ -# EMail - -* DebianTemplate duplizieren -* HA einrichten - -https://github.com/mailcow/mailcow-dockerized - -[DNS](https://mailcow.github.io/mailcow-dockerized-docs/prerequisite-dns/) -[installation](https://mailcow.github.io/mailcow-dockerized-docs/i_u_m_install/) - -[backup](https://mailcow.github.io/mailcow-dockerized-docs/third_party-borgmatic/) - - -ssh://u263336@u263336.your-storagebox.de:23/home/mailcow - - -## ToDo - -* PTR einträge (windcloud fragen) - wo dns hosten? - -* bei problemen ipv6 deaktivieren \ No newline at end of file diff --git a/docs/apps/foodsoft.md b/docs/apps/foodsoft.md deleted file mode 100644 index 579b9d1..0000000 --- a/docs/apps/foodsoft.md +++ /dev/null @@ -1,32 +0,0 @@ -# Foodsoft - - - - -### Migration - -1. Neue instanz aufsetzen -2. Backup aus alter instanz erstellen - - -``` -docker exec foodcoops_mariadb_1 bash -c "mysqldump -ufoodsoft -p${DB_PASSWORD} foodsoft_demo" > 2022-02-27.sql -``` - -3. Backup einspielen - -``` -➜ docker cp 2022-01-04.sql wandelgut-foodsoft_db.1.b1nspplwa49o55pwj5ddcnn0r:/tmp/ -➜ docker exec -it wandelgut-foodsoft_db.1.b1nspplwa49o55pwj5ddcnn0r bash -root@dcdca844b2f1:/# cd /tmp/ - - mysql -p$(cat /run/secrets/db_root_password) - -MariaDB [(none)]> create database tantewandel; - -root@dcdca844b2f1:/tmp# mysql -p$(cat /run/secrets/db_root_password) tantewandel < 2022-01-04.sql -root@dcdca844b2f1:/tmp# exit -➜ docker exec -it wandelgut-foodsoft_app.1.zvlhnq4vvmlf4iuck7ymz96xu bash -nobody@22e376ecea83:/usr/src/app$ SECRET_KEY_BASE=$(cat /run/secrets/secret_key_base) bundle exec rake db:migrate -``` - diff --git a/docs/apps/mobilizon.md b/docs/apps/mobilizon.md deleted file mode 100644 index 0a708b3..0000000 --- a/docs/apps/mobilizon.md +++ /dev/null @@ -1,10 +0,0 @@ -# Mobilizon - -Ziel: Lübecks veranstaltungen auf einer freien Plattform - -These: Bürgis wollen eine andere Plattform als fb für Veranstaltungen -Experiment: - -https://mobilizon.org/de/ -https://docs.joinmobilizon.org/administration/install/docker/ -https://framagit.org/framasoft/joinmobilizon/docker/-/blob/master/docker-compose.yml diff --git a/docs/apps/nextcloud.md b/docs/apps/nextcloud.md index b9e9d0f..0e470b1 100644 --- a/docs/apps/nextcloud.md +++ b/docs/apps/nextcloud.md @@ -6,10 +6,8 @@ im authentik: app anlegen -!!! note "Auf lit.cloud Infrastruktur" - `git clone https://git.local-it.org/LIT/nextcloud ~/.abra/apps/nextcloud` - ``` +git clone https://git.local-it.org/LIT/nextcloud ~/.abra/apps/nextcloud abra app new --secrets --domain example.com --server servername --app-name servername_cloud cloud abra config servername_cloud abra deploy servername_cloud diff --git a/docs/apps/onlyoffice.md b/docs/apps/onlyoffice.md index 799bcc7..706967e 100644 --- a/docs/apps/onlyoffice.md +++ b/docs/apps/onlyoffice.md @@ -1,12 +1,7 @@ # Onlyoffice -!!! note "Auf lit.cloud Infrastruktur" - ``` - git clone https://git.local-it.org/LIT/onlyoffice.git ~/.abra/apps/onlyoffice - ``` - - ``` +git clone https://git.local-it.org/LIT/onlyoffice.git ~/.abra/apps/onlyoffice abra app new --domain office.example.com --server servername --app-name servername_onlyoffice onlyoffice abra app config servername_onlyoffice abra app deploy servername_onlyoffice