Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deploy(sd-app): remove configuration templating #1037

Merged
merged 1 commit into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ include LICENSE
include VERSION
include sd-proxy/*
include sd-whonix/*
include sd-app/*
include sd-workstation/*
include sdw_updater/*.py
include sdw_notify/*.py
Expand Down
26 changes: 0 additions & 26 deletions dom0/sd-app-config.sls

This file was deleted.

1 change: 0 additions & 1 deletion dom0/sd-workstation.top
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ base:
- sd-gpg-files
- sd-logging-setup
sd-app:
- sd-app-config
- sd-mime-handling
sd-whonix:
- sd-whonix-hidserv-key
Expand Down
2 changes: 0 additions & 2 deletions rpm-build/SPECS/securedrop-workstation-dom0-config.spec
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ configuration over time.
# direct_url.json is is not reproducible and not strictly needed
rm %{buildroot}/%{python3_sitelib}/*%{version}.dist-info/direct_url.json
sed -i "/\.dist-info\/direct_url\.json,/d" %{buildroot}/%{python3_sitelib}/*%{version}.dist-info/RECORD
install -m 755 -d %{buildroot}/srv/salt/sd/sd-app
install -m 755 -d %{buildroot}/srv/salt/sd/sd-proxy
install -m 755 -d %{buildroot}/srv/salt/sd/sd-journalist
install -m 755 -d %{buildroot}/srv/salt/sd/sd-whonix
Expand All @@ -77,7 +76,6 @@ install -m 644 dom0/*.conf %{buildroot}/srv/salt/
install -m 755 dom0/remove-tags.py %{buildroot}/srv/salt/remove-tags
install -m 755 dom0/securedrop-handle-upgrade %{buildroot}/srv/salt/
install -m 755 dom0/update-xfce-settings %{buildroot}/srv/salt/
install -m 644 sd-app/* %{buildroot}/srv/salt/sd/sd-app/
install -m 644 sd-proxy/* %{buildroot}/srv/salt/sd/sd-proxy/
install -m 644 sd-whonix/* %{buildroot}/srv/salt/sd/sd-whonix/
install -m 644 sd-workstation/* %{buildroot}/srv/salt/sd/sd-workstation/
Expand Down
1 change: 0 additions & 1 deletion sd-app/config.json.j2

This file was deleted.