forked from deltachat/chatmail
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from roughnecks/main
Update Chatmail
- Loading branch information
Showing
39 changed files
with
992 additions
and
242 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -38,7 +38,9 @@ jobs: | |
if [ -f dkimkeys-ipv4/dkimkeys/opendkim.private ]; then rsync -avz -e "ssh -o StrictHostKeyChecking=accept-new" dkimkeys-ipv4 [email protected]:/tmp/ || true; fi | ||
if [ "$(ls -A acme-ipv4/acme/certs)" ]; then rsync -avz -e "ssh -o StrictHostKeyChecking=accept-new" acme-ipv4 [email protected]:/tmp/ || true; fi | ||
# make sure CAA record isn't set | ||
scp .github/workflows/staging-ipv4.testrun.org-default.zone [email protected]:/etc/nsd/staging-ipv4.testrun.org.zone | ||
ssh -o StrictHostKeyChecking=accept-new [email protected] sed -i '/CAA/d' /etc/nsd/staging-ipv4.testrun.org.zone | ||
ssh [email protected] nsd-checkzone staging-ipv4.testrun.org /etc/nsd/staging-ipv4.testrun.org.zone | ||
ssh [email protected] systemctl reload nsd | ||
- name: rebuild staging-ipv4.testrun.org to have a clean VPS | ||
|
@@ -64,8 +66,8 @@ jobs: | |
rsync -e "ssh -o StrictHostKeyChecking=accept-new" -avz [email protected]:/tmp/acme-ipv4 acme-restore || true | ||
rsync -avz [email protected]:/tmp/dkimkeys-ipv4 dkimkeys-restore || true | ||
# restore acme & dkim state to staging2.testrun.org | ||
rsync -avz acme-restore/acme-ipv4/acme [email protected]:/var/lib/acme || true | ||
rsync -avz dkimkeys-restore/dkimkeys-ipv4/dkimkeys [email protected]:/etc/dkimkeys || true | ||
rsync -avz acme-restore/acme-ipv4/acme [email protected]:/var/lib/ || true | ||
rsync -avz dkimkeys-restore/dkimkeys-ipv4/dkimkeys [email protected]:/etc/ || true | ||
ssh -o StrictHostKeyChecking=accept-new -v [email protected] chown root:root -R /var/lib/acme || true | ||
- name: run formatting checks | ||
|
@@ -93,6 +95,6 @@ jobs: | |
- name: cmdeploy test | ||
run: CHATMAIL_DOMAIN2=nine.testrun.org cmdeploy test --slow | ||
|
||
- name: cmdeploy dns (try 3 times) | ||
run: cmdeploy dns || cmdeploy dns || cmdeploy dns | ||
- name: cmdeploy dns | ||
run: cmdeploy dns -v | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -38,7 +38,9 @@ jobs: | |
if [ -f dkimkeys/opendkim.private ]; then rsync -avz -e "ssh -o StrictHostKeyChecking=accept-new" dkimkeys [email protected]:/tmp/ || true; fi | ||
if [ "$(ls -A acme/certs)" ]; then rsync -avz -e "ssh -o StrictHostKeyChecking=accept-new" acme [email protected]:/tmp/ || true; fi | ||
# make sure CAA record isn't set | ||
ssh -o StrictHostKeyChecking=accept-new [email protected] sed -i '/CAA/d' /etc/nsd/staging2.testrun.org.zone | ||
scp -o StrictHostKeyChecking=accept-new .github/workflows/staging.testrun.org-default.zone [email protected]:/etc/nsd/staging2.testrun.org.zone | ||
ssh [email protected] sed -i '/CAA/d' /etc/nsd/staging2.testrun.org.zone | ||
ssh [email protected] nsd-checkzone staging2.testrun.org /etc/nsd/staging2.testrun.org.zone | ||
ssh [email protected] systemctl reload nsd | ||
- name: rebuild staging2.testrun.org to have a clean VPS | ||
|
@@ -64,8 +66,8 @@ jobs: | |
rsync -e "ssh -o StrictHostKeyChecking=accept-new" -avz [email protected]:/tmp/acme acme-restore || true | ||
rsync -avz [email protected]:/tmp/dkimkeys dkimkeys-restore || true | ||
# restore acme & dkim state to staging2.testrun.org | ||
rsync -avz acme-restore/acme/ [email protected]:/var/lib/acme || true | ||
rsync -avz dkimkeys-restore/dkimkeys/ [email protected]:/etc/dkimkeys || true | ||
rsync -avz acme-restore/acme [email protected]:/var/lib/ || true | ||
rsync -avz dkimkeys-restore/dkimkeys [email protected]:/etc/ || true | ||
ssh -o StrictHostKeyChecking=accept-new -v [email protected] chown root:root -R /var/lib/acme || true | ||
- name: run formatting checks | ||
|
@@ -91,6 +93,6 @@ jobs: | |
- name: cmdeploy test | ||
run: CHATMAIL_DOMAIN2=nine.testrun.org cmdeploy test --slow | ||
|
||
- name: cmdeploy dns (try 3 times) | ||
run: cmdeploy dns -v || cmdeploy dns -v || cmdeploy dns -v | ||
- name: cmdeploy dns | ||
run: cmdeploy dns -v | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.