aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Dessaux2024-09-09 23:15:11 +0200
committerJulien Dessaux2024-09-11 00:20:54 +0200
commit8490464f32983f6302e757769a7018c83e1a33c3 (patch)
tree3ce919045f92faa4272e6ef31c4b40364507fb20
parentFix image building errors when podman is running pods (diff)
downloadev-scripts-8490464f32983f6302e757769a7018c83e1a33c3.tar.gz
ev-scripts-8490464f32983f6302e757769a7018c83e1a33c3.tar.bz2
ev-scripts-8490464f32983f6302e757769a7018c83e1a33c3.zip
Added ods deploy job
-rw-r--r--Makefile16
-rw-r--r--certificates/certificates-deploy.sh31
-rw-r--r--certificates/certificates-deploy.yaml9
-rw-r--r--ods/ods-deploy.yaml21
4 files changed, 73 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 765b488..b00e4f6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,22 @@ SHELL:=bash
.PHONY: check
check: ## make check # Check syntax of eventline jobs
- evcli deploy-jobs --dry-run */*.yaml
+ evcli deploy-jobs --dry-run eventline/*.yaml \
+ certificates/*.yaml \
+ grenade-brothers/*.yaml \
+ mirror-to-github/*.yaml \
+ ods/*.yaml \
+ www/*.yaml
+ evcli deploy-jobs --dry-run -p upgrades upgrades/*.yaml
.PHONY: run
run: ## make run # deploy all jobs
evcli deploy-jobs eventline/*.yaml \
- grenade-brothers/*.yaml \
- mirror-to-github/*.yaml \
- www/*.yaml
+ certificates/*.yaml \
+ grenade-brothers/*.yaml \
+ mirror-to-github/*.yaml \
+ ods/*.yaml \
+ www/*.yaml
evcli deploy-jobs -p upgrades upgrades/*.yaml
help:
diff --git a/certificates/certificates-deploy.sh b/certificates/certificates-deploy.sh
new file mode 100644
index 0000000..f431563
--- /dev/null
+++ b/certificates/certificates-deploy.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+CRT="${EVENTLINE_DIR}/identities/adyxax-org-fullchain/password"
+KEY="${EVENTLINE_DIR}/identities/adyxax-org-key/password"
+SSHKEY="${EVENTLINE_DIR}/identities/ssh/private_key"
+
+SSHOPTS="-i ${SSHKEY} -o StrictHostKeyChecking=accept-new"
+
+scp ${SSHOPTS} "${KEY}" root@yen.adyxax.org:/etc/nginx/adyxax.org.key
+scp ${SSHOPTS} "${CRT}" root@yen.adyxax.org:/etc/nginx/adyxax.org-fullchain.cer
+scp ${SSHOPTS} "${KEY}" root@yen.adyxax.org:/var/imap/yen.adyxax.org.key
+scp ${SSHOPTS} "${CRT}" root@yen.adyxax.org:/etc/ssl/yen.adyxax.org.crt
+#scp 'adyxax.org.key' root@myth.adyxax.org:/etc/smtpd/adyxax.org.key
+#scp 'adyxax.org.crt' root@myth.adyxax.org:/etc/smtpd/fullchain.cer
+ssh ${SSHOPTS} root@yen.adyxax.org rcctl restart cyrus_imapd
+ssh ${SSHOPTS} root@yen.adyxax.org rcctl restart nginx
+
+#cp 'adyxax.org.crt' ~/git/adyxax/ansible/files/adyxax.org.fullchain
+#cp 'adyxax.org.key' ~/git/adyxax/ansible/files/adyxax.org.key
+# TODO ansible make run
+scp ${SSHOPTS} "${KEY}" root@lore.adyxax.org:/usr/local/etc/nginx/adyxax.org.key
+scp ${SSHOPTS} "${CRT}" root@lore.adyxax.org:/usr/local/etc/nginx/adyxax.org.fullchain
+ssh ${SSHOPTS} root@lore.adyxax.org service nginx reload
+scp ${SSHOPTS} "${KEY}" root@kaladin.adyxax.org:/usr/local/etc/nginx/adyxax.org.key
+scp ${SSHOPTS} "${CRT}" root@kaladin.adyxax.org:/usr/local/etc/nginx/adyxax.org.fullchain
+ssh ${SSHOPTS} root@kaladin.adyxax.org service nginx reload
+scp ${SSHOPTS} "${KEY}" root@kaladin.adyxax.org:/usr/local/etc/adyxax.org.key
+scp ${SSHOPTS} "${CRT}" root@kaladin.adyxax.org:/usr/local/etc/adyxax.org.fullchain
+#ssh -o StrictHostKeyChecking=no root@kaladin.adyxax.org service ngircd restart
+# TODO reload nginx, restart ngircd
diff --git a/certificates/certificates-deploy.yaml b/certificates/certificates-deploy.yaml
new file mode 100644
index 0000000..185a50b
--- /dev/null
+++ b/certificates/certificates-deploy.yaml
@@ -0,0 +1,9 @@
+name: "certificates-deploy"
+steps:
+ - label: make deploy
+ script:
+ path: "./certificates-deploy.sh"
+identities:
+ - adyxax-org-fullchain
+ - adyxax-org-key
+ - ssh
diff --git a/ods/ods-deploy.yaml b/ods/ods-deploy.yaml
new file mode 100644
index 0000000..f77b50c
--- /dev/null
+++ b/ods/ods-deploy.yaml
@@ -0,0 +1,21 @@
+name: "ods-deploy"
+steps:
+ - label: git clone
+ script:
+ path: "../common/git-clone.sh"
+ arguments:
+ - "https://git.adyxax.org/adyxax/ods"
+ - label: make deploy
+ script:
+ path: "../common/make.sh"
+ arguments:
+ - "deploy"
+ - label: clean
+ script:
+ path: "../common/clean.sh"
+runner:
+ identity: "ssh-myth"
+ name: "ssh"
+ parameters:
+ host: "myth.adyxax.org"
+ user: "root"