diff --git a/group_vars/all.yaml b/group_vars/all.yaml index 0218d9a..de91132 100644 --- a/group_vars/all.yaml +++ b/group_vars/all.yaml @@ -17,6 +17,11 @@ hedgedoc_db_password: HISTORY_PURGED_SECRET paperless_secret_key: HISTORY_PURGED_SECRET +kube_adm_token: HISTORY_PURGED_SECRET + +storagebox_u244665_sub2_password: HISTORY_PURGED_SECRET +slapd_backup_submit_token: HISTORY_PURGED_SECRET + tube_archivist_elasticsearch_password: HISTORY_PURGED_SECRET reactive_resume_postgres_password: HISTORY_PURGED_SECRET diff --git a/roles/backup-vm/files/ths_cal_backup.sh b/roles/backup-vm/files/ths_cal_backup.sh index 276e758..0be91ee 100644 --- a/roles/backup-vm/files/ths_cal_backup.sh +++ b/roles/backup-vm/files/ths_cal_backup.sh @@ -18,10 +18,10 @@ zip -q -r ~/ths_carddav_telefon_backups/${BACKUP_NAME} ~/ths-carddav-telefon ~/backups/backup-tools/backup_manager.py ~/ths_carddav_telefon_backups/ --debug # send to storrage box -rsync --delete --rsh="/usr/bin/sshpass -p HISTORY_PURGED_SECRET ssh -p23" -r ths_caldav_backups/* u244665-sub2@u244665.your-storagebox.de:./ths_caldav_backups/ -rsync --delete --rsh="/usr/bin/sshpass -p HISTORY_PURGED_SECRET ssh -p23" -r ths_carddav_backups/* u244665-sub2@u244665.your-storagebox.de:./ths_caldav_backups/carddav/ -rsync --delete --rsh="/usr/bin/sshpass -p HISTORY_PURGED_SECRET ssh -p23" -r ths_carddav_telefon_backups/* u244665-sub2@u244665.your-storagebox.de:./ths_caldav_backups/carddav_telefon/ +rsync --delete --rsh="/usr/bin/sshpass -p {{ storagebox_u244665_sub2_password }} ssh -p23" -r ths_caldav_backups/* u244665-sub2@u244665.your-storagebox.de:./ths_caldav_backups/ +rsync --delete --rsh="/usr/bin/sshpass -p {{ storagebox_u244665_sub2_password }} ssh -p23" -r ths_carddav_backups/* u244665-sub2@u244665.your-storagebox.de:./ths_caldav_backups/carddav/ +rsync --delete --rsh="/usr/bin/sshpass -p {{ storagebox_u244665_sub2_password }} ssh -p23" -r ths_carddav_telefon_backups/* u244665-sub2@u244665.your-storagebox.de:./ths_caldav_backups/carddav_telefon/ curl -H "Content-Type: application/json" \ -X POST https://async-icinga.atlantishq.de/report \ - -d '{ "service" : "ths_caldav_backup", "token" : "HISTORY_PURGED_SECRET", "status" : "OK", "info" : "" }' + -d '{ "service" : "ths_caldav_backup", "token" : "{{ slapd_backup_submit_token }}", "status" : "OK", "info" : "" }' diff --git a/roles/backup-vm/templates/slapd_backup.sh b/roles/backup-vm/templates/slapd_backup.sh index 1640a69..8e8c86d 100644 --- a/roles/backup-vm/templates/slapd_backup.sh +++ b/roles/backup-vm/templates/slapd_backup.sh @@ -9,7 +9,7 @@ rsync -r --remove-source-files sheppy@192.168.122.112:$DIR /home/sheppy ~/backups/backup-tools/backup_manager.py --extensions ldif -- $DIR -rsync --delete --rsh="/usr/bin/sshpass -p HISTORY_PURGED_SECRET ssh -p23" -r slapd_backup/* u244665-sub2@u244665.your-storagebox.de:./slapd_backup/ +rsync --delete --rsh="/usr/bin/sshpass -p {{ storagebox_u244665_sub2_password }} ssh -p23" -r slapd_backup/* u244665-sub2@u244665.your-storagebox.de:./slapd_backup/ for file in "$DIR"/*; do # Check if the file is empty @@ -21,4 +21,4 @@ done curl -H "Content-Type: application/json" \ -X POST https://async-icinga.atlantishq.de/report \ - -d '{ "service" : "slapd_backup", "token" : "HISTORY_PURGED_SECRET", "status" : "OK", "info" : "" }' + -d '{ "service" : "slapd_backup", "token" : "{{ slapd_backup_submit_token }}", "status" : "OK", "info" : "" }'