Moved QA scripts out of RPM-included directory

freedomofpress · Oct 27, 2020 · 3d16c1e · 3d16c1e
1 parent 40cb154
commit 3d16c1e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/scripts/qa-switch.sh → utils/qa-switch.sh b/scripts/qa-switch.sh → 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 → utils/qa-switch/buster.sls b/scripts/qa-switch/buster.sls → utils/qa-switch/buster.sls
diff --git a/scripts/qa-switch/dom0.sls → utils/qa-switch/dom0.sls b/scripts/qa-switch/dom0.sls → utils/qa-switch/dom0.sls
diff --git a/scripts/qa-switch/sd-qa-config.yml → utils/qa-switch/sd-qa-config.yml b/scripts/qa-switch/sd-qa-config.yml → utils/qa-switch/sd-qa-config.yml
diff --git a/scripts/qa-switch/top.sls → utils/qa-switch/top.sls b/scripts/qa-switch/top.sls → utils/qa-switch/top.sls