From 58dcb5b50fc727fe963cff2b62f787bc37066eda Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 30 Apr 2022 22:57:48 +0200 Subject: [PATCH 1/4] ci: switch to dedicated host for website --- .drone.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.drone.yml b/.drone.yml index 82c7b59..adc87b2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,20 +23,5 @@ steps: - "!LICENSE.md" - "!shell.nix" - ./* - target: /data/www/pub.solar/matrix-domain/ + target: /srv/pub.solar/ overwrite: true - - - name: fix permissions - image: appleboy/drone-ssh - settings: - host: pub.solar - port: 2020 - username: - from_secret: ps_ssh_user - key: - from_secret: ps_ssh_key - envs: - - ps_ssh_user - script: - - export SSH_USER=$PS_SSH_USER - - chown -R $SSH_USER:991 /data/www/pub.solar/matrix-domain From 72efeba00fb6d5231346d03db6b09a1e034b09c0 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sun, 1 May 2022 00:00:17 +0200 Subject: [PATCH 2/4] Add well-known for matrix federation https://github.com/spantaleev/matrix-docker-ansible-deploy/blob/master/docs/configuring-well-known.md#configuring-service-discovery-via-well-known --- .well-known/matrix/client | 24 ++++++++++++++++++++++++ .well-known/matrix/server | 3 +++ 2 files changed, 27 insertions(+) create mode 100644 .well-known/matrix/client create mode 100644 .well-known/matrix/server diff --git a/.well-known/matrix/client b/.well-known/matrix/client new file mode 100644 index 0000000..2dd3a10 --- /dev/null +++ b/.well-known/matrix/client @@ -0,0 +1,24 @@ +{ + "im.vector.riot.e2ee": { + "default": true + }, + "io.element.e2ee": { + "default": true, + "secure_backup_required": false, + "secure_backup_setup_methods": [] + }, + "m.homeserver": { + "base_url": "https://matrix.pub.solar" + }, + "m.identity_server": { + "base_url": "https://matrix.pub.solar" + }, + "m.integrations": { + "managers": [ + { + "api_url": "https://dimension.pub.solar/api/v1/scalar", + "ui_url": "https://dimension.pub.solar/element" + } + ] + } +} diff --git a/.well-known/matrix/server b/.well-known/matrix/server new file mode 100644 index 0000000..ccc9d00 --- /dev/null +++ b/.well-known/matrix/server @@ -0,0 +1,3 @@ +{ + "m.server": "matrix.pub.solar:8448" +} From f3d1a7ee673ffc9fcb58a7080b27e4ca7f2be359 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sun, 1 May 2022 00:01:40 +0200 Subject: [PATCH 3/4] Use nix-direnv for shell.nix --- .envrc | 5 ++++- .gitignore | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.envrc b/.envrc index 051d09d..24f0da1 100644 --- a/.envrc +++ b/.envrc @@ -1 +1,4 @@ -eval "$(lorri direnv)" +# reload when these files change +watch_file shell.nix + +use nix diff --git a/.gitignore b/.gitignore index 6e92f57..e4eaed1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ tags +.direnv From 2f0393d05c0485d14508982a9081ebb745c96593 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sun, 1 May 2022 00:43:17 +0200 Subject: [PATCH 4/4] Add green hosting hint and Greenbaum Cloud logo+links --- about.html | 8 ++++++++ assets/greenbaum-cloud-logo.svg | 34 +++++++++++++++++++++++++++++++++ docker-compose.yml | 26 +++++++++++++++++++++++++ index.html | 7 +++++++ style.css | 34 ++++++++++++++++++++++++--------- 5 files changed, 100 insertions(+), 9 deletions(-) create mode 100644 assets/greenbaum-cloud-logo.svg create mode 100644 docker-compose.yml diff --git a/about.html b/about.html index e03197c..ee3c41e 100644 --- a/about.html +++ b/about.html @@ -47,6 +47,10 @@

Unsere Datenschutzerklärung

Findest Du hier.

+ +

Unser Hosting

+

Unsere Freunde bei der Firma Greenbaum Cloud (Jhonas arbeitet dort auch) sind so cool uns ihre Infrastruktur momentan gratis zur Verfügung zu stellen. Klickt gerne mal rein.

+

Hi! We're pub.solar

@@ -78,6 +82,10 @@

Our Privacy Policy

Is over here.

+ +

Our Hosting

+

Our friends at Greenbaum Cloud (Jhonas works there) are kindly providing us their infrastructure for hosting without charging us. Give them a visit.

+