diff --git a/.gitignore b/.gitignore index 94b4eb5..5e50f48 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,6 @@ electrs/* fulcrumx/* nginx/* redis/* -events/signals/* docker-compose.override.yml # Commit these empty directories @@ -36,7 +35,6 @@ docker-compose.override.yml !db/citadel-seed db/citadel-seed/* !db/citadel-seed/.gitkeep -!events/signals/.gitkeep !lnd/.gitkeep !logs/.gitkeep !tor/data/.gitkeep @@ -46,7 +44,6 @@ db/citadel-seed/* !nginx/.gitkeep !redis/.gitkeep !fulcrumx/.gitkeep -!events/signals/.gitkeep !**/*.license services/installed.json diff --git a/docker-compose.yml b/docker-compose.yml index ba90ff9..488db1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -120,7 +120,6 @@ services: volumes: - ${PWD}/info.json:/info.json - ${PWD}/db:/db - - ${PWD}/events/signals:/signals - ${PWD}/events:/events - ${PWD}/apps:/apps - ${PWD}/lnd:/lnd:ro diff --git a/events/signals/.gitkeep b/events/signals/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/scripts/backup/decoy-trigger b/scripts/backup/decoy-trigger index 9d0465b..ddc8918 100755 --- a/scripts/backup/decoy-trigger +++ b/scripts/backup/decoy-trigger @@ -39,7 +39,7 @@ main () { echo "Sleeping for ${delay} seconds..." sleep $delay echo "Triggering decoy backup..." - touch "${CITADEL_ROOT}/events/signals/backup" + "${CITADEL_ROOT}/scripts/backup/backup" done } diff --git a/scripts/backup/monitor b/scripts/backup/monitor index 5234ac9..6bc499c 100755 --- a/scripts/backup/monitor +++ b/scripts/backup/monitor @@ -48,10 +48,10 @@ monitor_file () { sleep 1 done echo "$file_path created! Triggering backup..." - touch "${CITADEL_ROOT}/events/signals/backup" + "${CITADEL_ROOT}/scripts/backup/backup" fi - fswatch -0 --event Updated $file_path | xargs -0 -n 1 -I {} touch "${CITADEL_ROOT}/events/signals/backup" + fswatch -0 --event Updated $file_path | xargs -0 -n 1 -I {} "${CITADEL_ROOT}/scripts/backup/backup" } if [[ ! -d "${CITADEL_ROOT}" ]]; then diff --git a/scripts/update/.updateignore b/scripts/update/.updateignore index b7915c6..92b78e1 100644 --- a/scripts/update/.updateignore +++ b/scripts/update/.updateignore @@ -5,7 +5,6 @@ lnd/* statuses tor/* electrs/* -events/signals logs/* app-data/* apps/networking.json