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.

Sign up for GitHub

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

Upgrade boxes for SecureDrop 1.0.0 #4857

Merged
merged 4 commits into from
Sep 23, 2019
Merged

Upgrade boxes for SecureDrop 1.0.0 #4857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5e7f9a
Move grsec role before common role
emkll Sep 20, 2019
9fcfa04
Fixes v3 keypair generation in upgrade box prep
Sep 20, 2019
fd26ab0
Add upgrade boxes for SecureDrop 1.0.0
emkll Sep 20, 2019
55e02f3
Update upgrade playbook for v3 onion services
emkll Sep 23, 2019
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
4 changes: 4 additions & 0 deletions molecule/upgrade/ansible-override-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,7 @@ etc_hosts:

# Set Xenial as apt repo channel for hosting deb packages
rep_dist: xenial

# Override path to repo root, to use the nested repo on the previous version.
# See molecule/shared/sd_clone.yml for details on the path structure.
sd_root_dir: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}/sd-orig"
5 changes: 4 additions & 1 deletion molecule/upgrade/playbook.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,13 @@
tasks:
- name: Spit out tor details
debug:
msg: "Source interface available at {{ lookup('file', molecule_ephemeral_directory+'/sd-orig/'+source_ths_path) }}"
msg:
- "V2 Source interface available at {{ lookup('file', molecule_ephemeral_directory+'/sd-orig/'+source_ths_path) }}"
- "V3 Source interface available at {{ lookup('file', molecule_ephemeral_directory+'/sd-orig/'+source_ths_v3_path) }}"
tags:
- onion
- always
vars:
molecule_ephemeral_directory: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}"
source_ths_path: /install_files/ansible-base/app-source-ths
source_ths_v3_path: /install_files/ansible-base/app-sourcev3-ths
4 changes: 4 additions & 0 deletions molecule/vagrant-packager/ansible-override-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ ssh_listening_address: 0.0.0.0
app_ip: "{{ hostvars['app-staging']['ansible_'+primary_network_iface].ipv4.address }}"
monitor_ip: "{{ hostvars['mon-staging']['ansible_'+primary_network_iface].ipv4.address }}"
apt_repo_url: https://apt.freedom.press

# Override path to repo root, to use the nested repo on the previous version.
# See molecule/shared/sd_clone.yml for details on the path structure.
sd_root_dir: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}/sd-orig"
11 changes: 11 additions & 0 deletions molecule/vagrant-packager/box_files/app_xenial_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,17 @@
}
],
"version": "0.14.0"
},
{
"providers": [
{
"checksum": "7045b1a593c70e6256bb059db43723d121001337d8c060498b6e463a93102c65",
"checksum_type": "sha256",
"name": "libvirt",
"url": "https://dev-bin.ops.securedrop.org/vagrant/app-staging-xenial_1.0.0.box"
}
],
"version": "1.0.0"
}
]
}
11 changes: 11 additions & 0 deletions molecule/vagrant-packager/box_files/mon_xenial_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,17 @@
}
],
"version": "0.14.0"
},
{
"providers": [
{
"checksum": "5a2b003e4eb5f396f78efec5ac64257f1df32a0416564937d5bfc405f8f6f6b0",
"checksum_type": "sha256",
"name": "libvirt",
"url": "https://dev-bin.ops.securedrop.org/vagrant/mon-staging-xenial_1.0.0.box"
}
],
"version": "1.0.0"
}
]
}
2 changes: 1 addition & 1 deletion molecule/vagrant-packager/playbook.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
any_errors_fatal: yes
roles:
- { role: install-fpf-repo, tags: fpf }
- { role: common, tags: common }
- { role: grsecurity, when: grsecurity, tags: [grsec, grsecurity] }
- { role: common, tags: common }
- { role: tor-hidden-services, tags: tor }
become: yes

Expand Down