From 3d16c1e83defdb4dbb8324682e1fef57c76ea929 Mon Sep 17 00:00:00 2001
From: Kevin O'Gorman <kog@freedom.press>
Date: Tue, 27 Oct 2020 14:28:05 -0400
Subject: [PATCH] Moved QA scripts out of RPM-included directory

---
 {scripts => utils}/qa-switch.sh               | 8 ++++----
 {scripts => utils}/qa-switch/buster.sls       | 0
 {scripts => utils}/qa-switch/dom0.sls         | 0
 {scripts => utils}/qa-switch/sd-qa-config.yml | 0
 {scripts => utils}/qa-switch/top.sls          | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename {scripts => utils}/qa-switch.sh (77%)
 rename {scripts => utils}/qa-switch/buster.sls (100%)
 rename {scripts => utils}/qa-switch/dom0.sls (100%)
 rename {scripts => utils}/qa-switch/sd-qa-config.yml (100%)
 rename {scripts => utils}/qa-switch/top.sls (100%)

diff --git a/scripts/qa-switch.sh b/utils/qa-switch.sh
similarity index 77%
rename from scripts/qa-switch.sh
rename to utils/qa-switch.sh
index 75499e94a..e73f519f1 100644
--- a/scripts/qa-switch.sh
+++ b/utils/qa-switch.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/bash
 
 #
-# Updates pre-consolidation templates and dom0 to use QA repos.
+# Updates securedrop templates and dom0 to use QA repos and
+# template-consolidation component.
 #
-# As root, untar the archive containing this script in /srv/salt, then run the script.
 #
 
 if [[ $(id -u) -ne 0 ]] ; then echo "Please run as root" ; exit 1 ; fi
@@ -23,7 +23,7 @@ echo Replacing prod config YAML...
 
 if [ ! -f "/srv/salt/qa-switcher/sd-default-config.yml.orig" ]; then
   cp sd-default-config.yml qa-switch/sd-default-config.yml.orig
-fi 
+fi
 cp qa-switch/sd-qa-config.yml sd-default-config.yml
 
-echo "Done! (Run this script again after 'sudo qubes-dom0-update -y' to reapply"
+echo "Done! (Run this script after 'sudo qubes-dom0-update -y' to reapply")
diff --git a/scripts/qa-switch/buster.sls b/utils/qa-switch/buster.sls
similarity index 100%
rename from scripts/qa-switch/buster.sls
rename to utils/qa-switch/buster.sls
diff --git a/scripts/qa-switch/dom0.sls b/utils/qa-switch/dom0.sls
similarity index 100%
rename from scripts/qa-switch/dom0.sls
rename to utils/qa-switch/dom0.sls
diff --git a/scripts/qa-switch/sd-qa-config.yml b/utils/qa-switch/sd-qa-config.yml
similarity index 100%
rename from scripts/qa-switch/sd-qa-config.yml
rename to utils/qa-switch/sd-qa-config.yml
diff --git a/scripts/qa-switch/top.sls b/utils/qa-switch/top.sls
similarity index 100%
rename from scripts/qa-switch/top.sls
rename to utils/qa-switch/top.sls