Merge branch 'release/0.3.5' into merge-0.3.5-into-develop

It was necessary to manually merge docs/hardware.md because we rewrote it on release/0.3.5 but had added a new section about recommended printers on develop.
freedomofpress · Sep 18, 2015 · d0f83a8 · d0f83a8
2 parents 0e05fd5 + f877b84
commit d0f83a8
Show file tree

Hide file tree

Showing 24 changed files with 1,098 additions and 181 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.3.5
+
+The issues for this release were tracked with the 0.3.5 milestone on Github: https://github.com/freedomofpress/securedrop/milestones/0.3.5
+
+* Use certificate verification instead of fingerprint verification by default for the OSSEC Postfix configuration (#1076)
+* Fix apache2 service failing to start on Digital Ocean (#1078)
+* Allow Apache to rotate its logs (#1074)
+* Prevent reboots during cron-apt upgrade (#1071)
+* Update documentation (#1107, #1112, #1113)
+* Blacklist additional kernel modules used for wireless networking (#1116)
+
 ## 0.3.4
 
 The issues for this release were tracked with the 0.3.4 milestone on Github: https://github.com/freedomofpress/securedrop/milestones/0.3.4

diff --git a/docs/hardware.md b/docs/hardware.md
diff --git a/docs/images/firewall/admin_workstation_static_ip_configuration.png b/docs/images/firewall/admin_workstation_static_ip_configuration.png
diff --git a/docs/images/firewall/edit_network_connection.png b/docs/images/firewall/edit_network_connection.png
diff --git a/docs/images/firewall/edit_wired_connection.png b/docs/images/firewall/edit_wired_connection.png
diff --git a/docs/images/firewall/editing_wired_connection.png b/docs/images/firewall/editing_wired_connection.png
diff --git a/docs/images/firewall/invoke_auto_upgrade.png b/docs/images/firewall/invoke_auto_upgrade.png
diff --git a/docs/images/firewall/ip_aliases_with_opt2.png b/docs/images/firewall/ip_aliases_with_opt2.png
diff --git a/docs/images/firewall/lan_rules.png b/docs/images/firewall/lan_rules.png
diff --git a/docs/images/firewall/lan_rules_with_opt2.png b/docs/images/firewall/lan_rules_with_opt2.png
diff --git a/docs/images/firewall/opt1_rules.png b/docs/images/firewall/opt1_rules.png
diff --git a/docs/images/firewall/opt1_rules_with_opt2.png b/docs/images/firewall/opt1_rules_with_opt2.png
diff --git a/docs/images/firewall/opt2_rules.png b/docs/images/firewall/opt2_rules.png
diff --git a/docs/images/firewall/pfsense_update_available.png b/docs/images/firewall/pfsense_update_available.png
diff --git a/docs/install.md b/docs/install.md
@@ -194,8 +194,8 @@ The Freedom of the Press Foundation Master Signing Key should have a fingerprint
 Verify that the current release tag was signed with the master signing key.
 
     cd securedrop/
-    git checkout 0.3.4
-    git tag -v 0.3.4
+    git checkout 0.3.5
+    git tag -v 0.3.5
 
 You should see 'Good signature from "Freedom of the Press Foundation Master Signing Key"' in the output of `git tag`. If you do not, signature verification has failed and you *should not* proceed with the installation. If this happens, please contact us at securedrop@freedom.press.
 

diff --git a/docs/network_firewall.md b/docs/network_firewall.md
diff --git a/install_files/ansible-base/group_vars/securedrop.yml b/install_files/ansible-base/group_vars/securedrop.yml
@@ -2,7 +2,7 @@
 # Variables that apply to both the app and monitor server go in this file
 # If the monitor or app server need different values define the variable in 
 # hosts_vars/app.yml or host_vars/mon.yml host_vars/development.yml
-securedrop_app_code_version: "0.3.4"
+securedrop_app_code_version: "0.3.5"
 
 tor_wait_for_hidden_services: yes
 tor_hidden_services_parent_dir: "/var/lib/tor/services"
@@ -11,7 +11,9 @@ tor_DataDirectory: /var/lib/tor
 securedrop_tor_user: "debian-tor"
 
 disabled_kernel_modules:
+  - btusb
   - bluetooth
+  - iwlmvm
   - iwlwifi
 
 ssh_2fa_dependencies: