From ad776f2bb30abf0012ef34bd4b851a784ccea0b2 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Mon, 15 Jun 2020 23:46:05 +0200 Subject: [PATCH] added dev deploy added Matrix description --- .drone.yml | 28 +++++++++++++++++++++++++++- sites/de/services/matrix.md | 14 +++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index d50bcbf..1838b10 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,33 @@ steps: --- kind: pipeline type: docker -name: deploy +name: deploy-develop + +steps: + - name: deploy + image: alpine + environment: + FTP_HOST: + from_secret: FTP_HOST + FTP_USERNAME: + from_secret: FTP_USERNAME + FTP_PASSWORD: + from_secret: FTP_PASSWORD + commands: + - which lftp || ( apk --update add lftp ) + - lftp -e "mirror -R ./dist/ dev.sp-codes.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST + +depends_on: + - build + +trigger: + branch: + - develop + +--- +kind: pipeline +type: docker +name: deploy-master steps: - name: deploy diff --git a/sites/de/services/matrix.md b/sites/de/services/matrix.md index be9a3c6..d9b4a3f 100644 --- a/sites/de/services/matrix.md +++ b/sites/de/services/matrix.md @@ -5,4 +5,16 @@ title: Matrix --- # Matrix -Die Beschreibung zu Matrix folgt in Kürze. +[Matrix](https://matrix.org) ist eine moderne Software für dezentrale Kommunikation (wie E-Mail). + +Seit Ende 2019 betreibe ich einen öffentlichen Matrix-Server + +Weitere Informationen folgen... + +## Weitere nützliche Links + +* [Riot Web](https://chat.sp-codes.de/) +* [Verschiedene Apps](https://matrix.org/clients) +* [Liste öffentlicher Räume](https://view.matrix.org/) +* [Liste öffentlicher Matrix-Server](https://www.hello-matrix.net/public_servers.php) +* [Matrix FAQ](https://matrix.org/faq/)