Updates dom0 repo URL

.gitignore

@@ -113,7 +113,6 @@ builder/packages/securedrop-workstation-grsec/debian/files
 
 # rpm package build artifacts
 *.rpm
-rpm-repo/
 *.tar.gz
 rpm-build/BUILD/
 rpm-build/BUILDROOT/

Makefile

@@ -131,9 +131,6 @@ flake8: ## Lints all Python files with flake8
 template: ## Builds securedrop-workstation Qube template RPM
 	./builder/build-workstation-template
 
-publish-rpm: ## Uploads signed RPMs to dom0 repository
-	./scripts/publish-rpm
-
 prep-dom0: prep-salt # Copies dom0 config files for VM updates
 	sudo qubesctl top.enable sd-vm-updates
 	sudo qubesctl top.enable sd-dom0-files

README.md

@@ -238,21 +238,8 @@ qvm-create --template securedrop-workstation test-securedrop-workstation --class
 
 ### Building workstation deb packages
 
-```
-# go to the builder/ directory:
-cd builder/packages
-# build a specific package (e.g, grsecurity metapackage)
-make securedrop-workstation-grsec
-# OR build all the packages
-make all
-# run the tests
-virtualenv --python python3 .venv
-source .venv/bin/activate
-pip install -r requirements.txt
-# install test requirements and run the test
-apt install lintian
-make test
-```
+Debian packages for the SecureDrop Workstation components are maintained in a separate repository:
+https://github.com/freedomofpress/securedrop-debian-packaging/
 
 ### Building workstation rpm packages
 
@@ -531,12 +518,7 @@ For the Debian packages, see https://github.com/freedomofpress/securedrop-debian
 For the RPM packages, such as the `securedrop-workstation` TemplateVM package, first
 build the package (e.g. `make template`), then sign the RPM, as outlined above.
 
-To upload the package to S3, you'll need valid AWS credentials. Talk to a member of the ops team.
-Once you have valid credentials configured, install the dependencies (`pip install -r requirements.txt` in a virtualenv), then run:
-
-```
-./scripts/publish-rpm
-```
+To upload the package, submit a PR to https://github.com/freedomofpress/securedrop-workstation-dev-rpm-packages-lfs/
 
 The RPM will immediately be available in dom0. Provided you've run the Salt configurations,
 find it via:

dom0/sd-dom0-files.sls

@@ -38,7 +38,7 @@ dom0-workstation-rpm-repo:
         gpgcheck=1
         gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-securedrop-workstation-test
         enabled=1
-        baseurl=https://dev-bin.ops.securedrop.org/dom0-rpm-repo/
+        baseurl=https://yum-test.securedrop.org/workstation/dom0/f25
         name=SecureDrop Workstation Qubes dom0 repo
     - require:
       - file: dom0-rpm-test-key

dom0/sd-sys-firewall-files.sls

@@ -15,12 +15,9 @@ sys-firewall-rpm-test-key-script:
     - mode: 755
 
 sys-firewall-rpm-test-key-rclocal:
-  file.line:
+  file.append:
     - name: /rw/config/rc.local
-    - mode: insert
-    - location: end
-    - match: "/rw/config/sd-copy-rpm-repo-pubkey.sh"
-    - content: "/rw/config/sd-copy-rpm-repo-pubkey.sh"
+    - text: "/rw/config/sd-copy-rpm-repo-pubkey.sh"
 
 sys-firewall-rpm-test-key-import:
   cmd.run:

scripts/clone-to-dom0

@@ -14,7 +14,7 @@ if [[ "$(hostname)" != "dom0" ]]; then
 fi
 
 # Support environment variable overrides, but provide sane defaults.
-dev_vm="${SECUREDROP_DEV_VM:-work}"
+dev_vm="${SECUREDROP_DEV_VM:-sd-dev}"
 dev_dir="${SECUREDROP_DEV_DIR:-/home/user/securedrop-workstation}"
 
 # The dest directory in dom0 is not customizable.