Dataset Viewer
in_source_id
stringlengths 13
58
| issue
stringlengths 3
241k
| before_files
listlengths 1
3
| after_files
listlengths 1
3
| pr_diff
stringlengths 202
107M
|
|---|---|---|---|---|
OpenEnergyPlatform__oeplatform-1353 | Version in CITATION.cff is out of date
## Description of the issue
We have introduced the citation.cff file, which also contains a version. This should be updated every time a release is made. It would be great if the version could be imported automatically from the VERSION file so we don't have to maintain multiple version identifiers.
## Ideas of solution
- [x] add note to RELEASE_PROCEDURE.md (see #1228)
- [x] auto import a version update from the VERSION file
## Context and Environment
* Version used:
* Operating system:
* Environment setup and (python) version:
## Workflow checklist
- [x] I am aware of the workflow in [CONTRIBUTING.md](https://github.com/OpenEnergyPlatform/oeplatform/blob/develop/CONTRIBUTING.md)
| [
{
"content": "",
"path": "oeplatform/__init__.py"
}
]
| [
{
"content": "__version__ = \"0.14.1\"\n",
"path": "oeplatform/__init__.py"
}
]
| diff --git a/.bumpversion.cfg b/.bumpversion.cfg
new file mode 100644
index 000000000..6e9ce9e69
--- /dev/null
+++ b/.bumpversion.cfg
@@ -0,0 +1,8 @@
+[bumpversion]
+current_version = 0.14.1
+
+[bumpversion:file:VERSION]
+
+[bumpversion:file:CITATION.cff]
+
+[bumpversion:file:oeplatform/__init__.py]
diff --git a/CITATION.cff b/CITATION.cff
index efb76d24f..396a810ab 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -28,7 +28,7 @@ authors:
title: "Open Energy Family - Open Energy Platform (OEP)"
type: software
license: AGPL-3.0-or-later
-version: 0.11.1
-doi:
+version: 0.14.1
+doi:
date-released: 2022-12-12
-url: "https://github.com/OpenEnergyPlatform/oeplatform/"
\ No newline at end of file
+url: "https://github.com/OpenEnergyPlatform/oeplatform/"
diff --git a/RELEASE_PROCEDURE.md b/RELEASE_PROCEDURE.md
index 98d1c117f..965493a20 100644
--- a/RELEASE_PROCEDURE.md
+++ b/RELEASE_PROCEDURE.md
@@ -39,7 +39,7 @@ Before see How to [Contribute](https://github.com/OpenEnergyPlatform/oeplatform/
1. Update the oeplatform/versions/changelogs/ [`current.md`](https://github.com/OpenEnergyPlatform/oeplatform/blob/develop/versions/changelogs/current.md) (see the examples of previous releases)
- Change filename to release version (x_x_x.md)
- Copy template to `current.md`
- - Update `VERSION` with lastest version number
+ - Update version with `bumpversion --allow-dirty [minor|patch]`
1. Deploy release branch on TOEP.
- Test the changes
- Create a hotfix and merge changes into the release branch
diff --git a/docs_requirements.txt b/docs_requirements.txt
index 88bee4ce2..21a229edf 100644
--- a/docs_requirements.txt
+++ b/docs_requirements.txt
@@ -1,4 +1,6 @@
-mkdocs-material # Raises error in py3.6?? ~=9.1
-mkdocstrings # Raises error in py3.6?? ~=0.22
-mkdocstrings-python
-mike
\ No newline at end of file
+# does not run in (productive py3.6) but that's ok
+# because doc build should only runs on newer python on github
+mkdocs-material~=9.1
+mkdocstrings~=0.22
+mkdocstrings-python
+mike
diff --git a/oeplatform/__init__.py b/oeplatform/__init__.py
index e69de29bb..f075dd36a 100644
--- a/oeplatform/__init__.py
+++ b/oeplatform/__init__.py
@@ -0,0 +1 @@
+__version__ = "0.14.1"
diff --git a/requirements-dev.txt b/requirements-dev.txt
new file mode 100644
index 000000000..819ceb244
--- /dev/null
+++ b/requirements-dev.txt
@@ -0,0 +1,6 @@
+-r requirements.txt
+flake8
+black
+isort
+pre-commit
+bumpversion
|
kartoza__prj.app-866 | Only one organisation can be created per account
It seems that only one organisation can be created from a login account. The folks at Camptocamp have two separate organisations (companies) and are unable to create the second organisation from their login.
| [
{
"content": "",
"path": "django_project/core/settings/__init__.py"
}
]
| [
{
"content": "# coding=utf-8\n",
"path": "django_project/core/settings/__init__.py"
}
]
| diff --git a/django_project/base/tests/__init__.py b/django_project/base/tests/__init__.py
index b979ed160..22d4b6542 100644
--- a/django_project/base/tests/__init__.py
+++ b/django_project/base/tests/__init__.py
@@ -1 +1,3 @@
+# coding=utf-8
+"""Test for base App."""
__author__ = 'timlinux'
diff --git a/django_project/base/tests/test_views.py b/django_project/base/tests/test_views.py
index 0f8fd0e6d..b19b2b1b6 100644
--- a/django_project/base/tests/test_views.py
+++ b/django_project/base/tests/test_views.py
@@ -218,3 +218,203 @@ def test_GithubRepoView_with_login(self):
'github/populate-github.html'
]
self.assertEqual(response.template_name, expected_templates)
+
+
+class TestOrganisationCreate(TestCase):
+ """Test organisation creation."""
+ @override_settings(VALID_DOMAIN=['testserver', ])
+ def setUp(self):
+ """Setting up before each test."""
+ self.client = Client()
+ self.client.post(
+ '/set_language/', data = {'language': 'en'})
+ logging.disable(logging.CRITICAL)
+ self.user = UserF.create(**{
+ 'username': 'sonlinux',
+ 'is_staff': True,
+ })
+
+ self.user.set_password('password')
+ self.user.save()
+
+ # lets set up a testing project to create organisations from.
+ self.test_project = ProjectF.create()
+ self.unapproved_project = ProjectF.create(approved=False)
+ self.test_organisation = OrganisationF.create()
+
+ @override_settings(VALID_DOMAIN=['testserver', ])
+ def test_oroganisation_create_with_login(self):
+ """
+ Test that a single logged in user can create multiple organisations.
+ """
+ client = Client()
+ loged_in = client.login(username='sonlinux', password='password')
+
+ # Test client log in.
+ self.assertTrue(loged_in)
+
+ expected_templates = [
+ 'organisation/create.html'
+ ]
+ response = client.post(reverse('create-organisation'))
+ self.assertEqual(response.status_code, 200)
+
+ # Test if get the correct template view after creation.
+ self.assertEqual(response.template_name, expected_templates)
+
+ @override_settings(VALID_DOMAIN = ['testserver', ])
+ def test_multiple_organisation_create_with_single_login(self):
+ """
+ Test that a single logged in user can create multiple
+ organisations.
+ """
+ client = Client()
+ loged_in = client.login(username='sonlinux', password='password')
+
+ # Test that user is actually loged in.
+ self.assertTrue(loged_in)
+ post_data_list = [
+ 'Test organisation creation',
+ 'Test organisation creation two',
+ 'Test organisation creation three']
+
+ for post_data in post_data_list:
+ response = client.post(reverse('create-organisation'),
+ {'name': post_data})
+ self.assertEqual(response.status_code, 302)
+
+ @override_settings(VALID_DOMAIN = ['testserver', ])
+ def test_organisation_create_with_no_login(self):
+ """Test that no non-authenticated user can create an organisation."""
+ client = Client()
+ post_data = {
+ 'name': u'A new test organisation',
+ }
+ # response = client.post( reverse( 'account_login') , post_data )
+ response = client.post(reverse('create-organisation'), post_data)
+ self.assertEqual(response.status_code, 302)
+
+
+class TestOrganisationCreateWithSuperuserPermissions(TestCase):
+ """Test organisation creation with a superuser login."""
+ @override_settings(VALID_DOMAIN=['testserver', ])
+ def setUp(self):
+ """Setting up before each test."""
+ self.client = Client()
+ self.client.post(
+ '/set_language/', data = {'language': 'en'})
+ logging.disable(logging.CRITICAL)
+ self.user = UserF.create(**{
+ 'username': 'sonlinux',
+ 'is_superuser': True,
+ })
+
+ self.user.set_password('password')
+ self.user.save()
+
+ # lets set up a testing project to create organisations from.
+ self.test_project = ProjectF.create()
+ self.unapproved_project = ProjectF.create(approved=False)
+ self.test_organisation = OrganisationF.create()
+
+ @override_settings(VALID_DOMAIN=['testserver', ])
+ def test_oroganisation_create_with_superuser(self):
+ """
+ Test that a superuser login can create multiple organisations.
+ """
+ client = Client()
+ loged_in = client.login(username='sonlinux', password='password')
+
+ # Test client log in.
+ self.assertTrue(loged_in)
+
+ expected_templates = [
+ 'organisation/create.html'
+ ]
+ response = client.post(reverse('create-organisation'))
+ self.assertEqual(response.status_code, 200)
+
+ # Test if get the correct template view after creation.
+ self.assertEqual(response.template_name, expected_templates)
+
+ @override_settings(VALID_DOMAIN = ['testserver', ])
+ def test_multiple_organisation_create_with_superuser(self):
+ """
+ Test that a superuser login can create multiple organisations.
+ """
+ client = Client()
+ loged_in = client.login(username='sonlinux', password='password')
+
+ # Test that user is actually loged in.
+ self.assertTrue(loged_in)
+ post_data_list = [
+ 'Test organisation creation',
+ 'Test organisation creation two',
+ 'Test organisation creation three']
+
+ for post_data in post_data_list:
+ response = client.post(reverse('create-organisation'),
+ {'name': post_data})
+ self.assertEqual(response.status_code, 302)
+
+
+class TestOrganisationCreateWithNoneStaffPermissions(TestCase):
+ """Test organisation creation with a none staff user."""
+ @override_settings(VALID_DOMAIN=['testserver', ])
+ def setUp(self):
+ """Setting up before each test."""
+ self.client = Client()
+ self.client.post(
+ '/set_language/', data = {'language': 'en'})
+ logging.disable(logging.CRITICAL)
+ self.user = UserF.create(**{
+ 'username': 'sonlinux',
+ 'is_staff': False,
+ })
+
+ self.user.set_password('password')
+ self.user.save()
+
+ # lets set up a testing project to create organisations from.
+ self.test_project = ProjectF.create()
+ self.unapproved_project = ProjectF.create(approved=False)
+ self.test_organisation = OrganisationF.create()
+
+ @override_settings(VALID_DOMAIN=['testserver', ])
+ def test_oroganisation_create_with_none_staff_login(self):
+ """Test that a none staff user can create an organisations."""
+
+ client = Client()
+ loged_in = client.login(username='sonlinux', password='password')
+
+ # Test client log in.
+ self.assertTrue(loged_in)
+
+ expected_templates = [
+ 'organisation/create.html'
+ ]
+ response = client.post(reverse('create-organisation'))
+ self.assertEqual(response.status_code, 200)
+
+ # Test if get the correct template view after creation.
+ self.assertEqual(response.template_name, expected_templates)
+
+ @override_settings(VALID_DOMAIN = ['testserver', ])
+ def test_multiple_organisation_create_with_none_staff_user(self):
+ """
+ Test that a none staff user can create multiple organisations.
+ """
+ client = Client()
+ loged_in = client.login(username='sonlinux', password='password')
+
+ # Test that user is actually loged in.
+ self.assertTrue(loged_in)
+ post_data_list = [
+ 'Test organisation creation',
+ 'Test organisation creation two',
+ 'Test organisation creation three']
+
+ for post_data in post_data_list:
+ response = client.post(reverse('create-organisation'),
+ {'name': post_data})
+ self.assertEqual(response.status_code, 302)
diff --git a/django_project/core/settings/__init__.py b/django_project/core/settings/__init__.py
index e69de29bb..9bad5790a 100644
--- a/django_project/core/settings/__init__.py
+++ b/django_project/core/settings/__init__.py
@@ -0,0 +1 @@
+# coding=utf-8
|
CTFd__CTFd-598 | Docker startup getting stuck on mysqladmin ping
**Environment**:
- CTFd Version/Commit: ctfd/ctfd:latest from Docker hub (17 days old)
- Operating System: Amazon Linux AMI 2017.09.j x86_64 ECS HVM GP2
- Web Browser and Version: N/A
**What happened?**
Trying to setup CTFd with AWS ECS and RDS Aurora.
If I don't set the DATABASE_URL env variable, it works fine and starts.
If I do set the DATABASE_URL to mysql+pymysql://ctfd:<MYPASSWORD>@ctfd.<resource-id>i.eu-west-1.rds.amazonaws.com/ctfd I get stuck on docker-entrypoint.sh:7 `while ! mysqladmin ping -h db --silent; do`
**What did you expect to happen?**
That the ping should succeed and startup continue
**How to reproduce your issue**
Create an ECS task with ctfd/ctfd as image source, set env variable SECRET_KEY and DATABASE_URL. Start container.
I have made sure the container can access the database by running `docker exec container-id mysql -h ctfd.<resource-id>.eu-west-1.rds.amazonaws.com -p<SECRET PASSWORD>` which works.
**Any associated stack traces or error logs**
Just stuck on "Waiting on MySQL"
My question is basically: am I doing something wrong and should somehow make that "db" resolve to the database or is the script incorrect and should take the value of DATABASE_URL into account?
| [
{
"content": "from CTFd import create_app\n\napp = create_app()\n",
"path": "wsgi.py"
}
]
| [
{
"content": null,
"path": "wsgi.py"
}
]
| diff --git a/ctfd.ini b/ctfd.ini
deleted file mode 100644
index 951cae856..000000000
--- a/ctfd.ini
+++ /dev/null
@@ -1,46 +0,0 @@
-# UWSGI Configuration File
-# Install uwsgi (sudo apt-get install uwsgi), copy this file to
-# /etc/uwsgi/apps-available and then link it in /etc/uwsgi/apps-enabled
-# Only two lines below (commented) need to be changed for your config.
-# Then, you can use something like the following in your nginx config:
-#
-# # SERVER_ROOT is not / (e.g. /ctf)
-# location = /ctf { rewrite ^ /ctf/; }
-# location /ctf {
-# include uwsgi_params;
-# uwsgi_pass unix:/run/uwsgi/app/ctfd/socket;
-# }
-#
-# # SERVER_ROOT is /
-# location / {
-# include uwsgi_params;
-# wsgi_pass unix:/run/uwsgi/app/ctfd/socket;
-# }
-[uwsgi]
-# Where you've put CTFD
-chdir = /var/www/ctfd/
-# If SCRIPT_ROOT is not /
-#mount = /ctf=wsgi.py
-# SCRIPT_ROOT is /
-mount = /=wsgi.py
-
-# You shouldn't need to change anything past here
-plugin = python
-module = wsgi
-
-master = true
-processes = 1
-threads = 1
-
-vacuum = true
-
-manage-script-name = true
-wsgi-file = wsgi.py
-callable = app
-
-die-on-term = true
-
-# If you're not on debian/ubuntu, replace with uid/gid of web user
-uid = www-data
-gid = www-data
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 4fffb767d..9f36b6de8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,8 @@ services:
- UPLOAD_FOLDER=/var/uploads
- LOG_FOLDER=/var/log/CTFd
- DATABASE_URL=mysql+pymysql://root:ctfd@db/ctfd
+ - REDIS_URL=redis://cache:6379
+ - WORKERS=4
volumes:
- .data/CTFd/logs:/var/log/CTFd
- .data/CTFd/uploads:/var/uploads
@@ -32,7 +34,15 @@ services:
networks:
internal:
# This command is required to set important mariadb defaults
- command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --wait_timeout=28800]
+ command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --wait_timeout=28800, --log-warnings=0]
+
+ cache:
+ image: redis:4
+ restart: always
+ volumes:
+ - .data/redis:/data
+ networks:
+ internal:
networks:
default:
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 4fb8bd919..8cc99f88e 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,23 +1,35 @@
#!/bin/sh
+# Check that a .ctfd_secret_key file or SECRET_KEY envvar is set
+if [ ! -f .ctfd_secret_key ] && [ -z "$SECRET_KEY" ]; then
+ if [ $WORKERS -gt 1 ]; then
+ echo "[ ERROR ] You are configured to use more than 1 worker."
+ echo "[ ERROR ] To do this, you must define the SECRET_KEY environment variable or create a .ctfd_secret_key file."
+ echo "[ ERROR ] Exiting..."
+ exit 1
+ fi
+fi
+
+# Check that the database is available
if [ -n "$DATABASE_URL" ]
then
- # https://stackoverflow.com/a/29793382
- echo "Waiting on MySQL"
- while ! mysqladmin ping -h db --silent; do
+ database=`echo $DATABASE_URL | awk -F[@//] '{print $4}'`
+ echo "Waiting for $database to be ready"
+ while ! mysqladmin ping -h $database --silent; do
# Show some progress
echo -n '.';
sleep 1;
done
- echo "Ready"
+ echo "$database is ready"
# Give it another second.
sleep 1;
fi
+# Start CTFd
echo "Starting CTFd"
gunicorn 'CTFd:create_app()' \
--bind '0.0.0.0:8000' \
- --workers 1 \
+ --workers $WORKERS \
--worker-class 'gevent' \
--access-logfile "${LOG_FOLDER:-/opt/CTFd/CTFd/logs}/access.log" \
--error-logfile "${LOG_FOLDER:-/opt/CTFd/CTFd/logs}/error.log"
diff --git a/wsgi.py b/wsgi.py
deleted file mode 100644
index 67b0172f5..000000000
--- a/wsgi.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from CTFd import create_app
-
-app = create_app()
|
plotly__dash-2553 | [BUG] Flask 2.2.3 dependency has HIGH security vulnerability (fixed in 2.2.5)
Issue #2538 pinned the upper bound of the Flask dependency to 2.2.3. However Flask 2.2.3 is affected by a HIGH security vulnerability that is fixed in Flask 2.2.5. See https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-30861
Debian 11, Python 3.11 (from Python official 3.11 Docker image)
```
# pip install dash
Collecting dash
Downloading dash-2.10.1-py3-none-any.whl (10.3 MB)
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 10.3/10.3 MB 14.1 MB/s eta 0:00:00
Collecting Flask<=2.2.3,>=1.0.4 (from dash)
Downloading Flask-2.2.3-py3-none-any.whl (101 kB)
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 101.8/101.8 kB 17.0 MB/s eta 0:00:00
```
```
dash 2.10.1
dash-core-components 2.0.0
dash-html-components 2.0.0
dash-table 5.0.0
```
**Describe the bug**
Dash installs a vulnerable version of Flask and dependency scans flag the vulnerability.
**Expected behavior**
No known and fixed security vulnerabilities added. Perhaps Pin to 2.2.* instead of specific 2.2.3 version where future pins will find new security issues.
| [
{
"content": "__version__ = \"2.10.1\"\n",
"path": "dash/version.py"
}
]
| [
{
"content": "__version__ = \"2.10.2\"\n",
"path": "dash/version.py"
}
]
| diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90844ed6ca..54c5b0714e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/).
+## [2.10.2] - 2023-05-31
+
+## Changed
+
+- Set Flask and Werkzeug version upper bound to `<2.3`.
+
## [2.10.1] - 2023-05-30
## Fixed
diff --git a/dash/version.py b/dash/version.py
index 565443f86f..6c96c9755a 100644
--- a/dash/version.py
+++ b/dash/version.py
@@ -1 +1 @@
-__version__ = "2.10.1"
+__version__ = "2.10.2"
diff --git a/requires-install.txt b/requires-install.txt
index d7049d8735..8730b6d6ea 100644
--- a/requires-install.txt
+++ b/requires-install.txt
@@ -1,5 +1,5 @@
-Flask>=1.0.4,<=2.2.3
-Werkzeug<=2.2.3
+Flask>=1.0.4,<2.3.0
+Werkzeug<2.3.0
plotly>=5.0.0
dash_html_components==2.0.0
dash_core_components==2.0.0
|
horovod__horovod-1139 | Replace .step(synchronize=False) with optimizer.skip_synchronize()
NVIDIA AMP does not support passing additional flags to `optimizer.step()`, such as `optimizer.step(synchronize=False)`.
This PR switches API to use context manager:
```python
optimizer.synchronize()
with optimizer.skip_synchronize():
optimizer.step()
```
| [
{
"content": "__version__ = '0.16.3'\n",
"path": "horovod/__init__.py"
}
]
| [
{
"content": "__version__ = '0.16.4'\n",
"path": "horovod/__init__.py"
}
]
| diff --git a/horovod/__init__.py b/horovod/__init__.py
index 66e314a006..538eb5d865 100644
--- a/horovod/__init__.py
+++ b/horovod/__init__.py
@@ -1 +1 @@
-__version__ = '0.16.3'
+__version__ = '0.16.4'
|
freedomofpress__securedrop-1117 | Update kernel module blacklist
During an installation last week, we encountered an issue with the kernel module blacklist. The install was using the new generation of Intel NUCs ([NUC5i5RYK](http://www.amazon.com/dp/B00SD9ISIQ) and [NUC5i5RYH](http://www.amazon.com/dp/B00SD9IS1S/)). Unlike the previous generation of NUCs, which did not include wireless networking hardware by default, the new generation includes wireless networking hardware for Wifi and Bluetooth on the motherboard.
This means that Ubuntu running on the servers not only loaded the high-level kernel modules for wifi and bluetooth support (`iwlwifi` and `bluetooth`), it also loaded modules necessary for support on the specific (included) hardware: `iwlmvm` and `btusb`. When the `remove kernel modules` Ansible role ran, it failed with an error because it could not remove the top-level modules without removing their dependencies first.
A quickfix to get this working on the new hardware was to change `disabled_kernel_modules` in `group_vars/securedrop.yml` from:
``` yml
disabled_kernel_modules:
- bluetooth
- iwlwifi
```
to:
``` yml
disabled_kernel_modules:
- btusb
- bluetooth
- iwlmvm
- iwlwifi
```
The order of the modules is important! We need to make sure the the dependencies are removed prior to the target modules that depend on them.
This list is also likely specific to the new generation of Intel NUCs. If we want to support a wider variety of hardware, we may want to try being smart about removing kernel modules and their dependencies, e.g. something akin to this technique from [Stack Exchange](https://askubuntu.com/questions/317230/how-can-i-temporarily-disable-a-kernel-module).
Finally, we need to make sure this updated module blacklist still works on the old hardware as well.
| [
{
"content": "__version__ = '0.3.4'\n",
"path": "securedrop/version.py"
}
]
| [
{
"content": "__version__ = '0.3.5'\n",
"path": "securedrop/version.py"
}
]
| diff --git a/changelog.md b/changelog.md
index 067f5d8e02..cbfd4c1003 100644
--- 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
index 54b205225b..d024d25d4e 100644
--- a/docs/hardware.md
+++ b/docs/hardware.md
@@ -1,104 +1,177 @@
# Hardware for SecureDrop
-This document outlines requirements and recommended hardware for use with SecureDrop. If you have any questions, please contact [email protected].
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)*
-## SecureDrop Infrastructure
+- [Overview](#overview)
+ - [Required Hardware](#required-hardware)
+ - [Servers](#servers)
+ - [A note about virtualization](#a-note-about-virtualization)
+ - [Workstations](#workstations)
+ - [A note about recycled hardware](#a-note-about-recycled-hardware)
+ - [Optional Hardware](#optional-hardware)
+- [Specific Hardware Recommendations](#specific-hardware-recommendations)
+ - [Application/Monitor Servers](#applicationmonitor-servers)
+ - [Potential BIOS issue](#potential-bios-issue)
+ - [Secure Viewing Station (SVS)](#secure-viewing-station-svs)
+ - [A note about Hi-DPI displays](#a-note-about-hi-dpi-displays)
+ - [Tails USBs](#tails-usbs)
+ - [Transfer Device](#transfer-device)
+ - [Network Firewall](#network-firewall)
+ - [Network Switch](#network-switch)
+ - [Printers](#printers)
+ - [Monitor, Keyboard, Mouse](#monitor-keyboard-mouse)
-The SecureDrop infrastructure consists of different components, all of which are listed below. We recommend you read through the whole document and figure out what makes the most sense for your organization.
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-### App Server and Monitor Server
+This document outlines the required hardware components necessary to successfully install and operate a SecureDrop instance, and recommends some specific components that we have found to work well. If you have any questions, please email [email protected].
-The *Application Server* (or *App Server* for short) runs the SecureDrop application. This server hosts both the website that sources access (*Source Interface*) and the website that journalists access (*Document Interface*). The *Monitor Server* keeps track of the *App Server* and sends out email alerts if something seems wrong. SecureDrop requires that you have:
+## Overview
- * 1 x physical server for the *Application Server*, which will run the SecureDrop application.
- * 1 x physical server for the *Monitor Server*, which sends emails about issues with the *App Server*.
+### Required Hardware
-The SecureDrop application requires a 64-bit operating system. You can repurpose old hardware if it is capable of running 64-bit Ubuntu. Otherwise, we recommend you get two [Intel NUCs](http://www.amazon.com/dp/B00F3F38O2/) with power cords. Make sure you also get the cables required to connect the NUCs to a monitor. Additionally, you will need to get the following [two 240 GB hard drives](http://www.amazon.com/dp/B00BQ8RKT4/) and a [4 GB (2GBx2) memory kit](http://www.amazon.com/Crucial-PC3-12800-204-Pin-Notebook-CT2CP25664BF160B/dp/B005MWQ6WC/).
+#### Servers
-#### Potential BIOS issue
+These are the core components of a SecureDrop instance.
-The previous release of SecureDrop (0.2.1) was based on Ubuntu 12.04.1 (precise). We encountered issues installing this version of SecureDrop on some types of Intel NUCs. The problem manifested after installing Ubuntu on the NUC. The installation would complete, but rebooting after installation would not succeed.
+- **Application Server**: 1 physical server to run the SecureDrop web services.
+- **Monitor Server**: 1 physical server which monitors activity on the *Application Server* and sends email notifications to an administrator.
+- **Network Firewall**: 1 physical computer that is used as a dedicated firewall for the SecureDrop servers.
-We have not encountered this or any similar problems in testing the current release (0.3) with the Intel NUCs. Since 0.3 is based on Ubuntu 14.04.1 (trusty), we believe the issue has been resolved by Ubuntu.
+##### A note about virtualization
-If you do encounter issues booting Ubuntu on the NUCs, try [updating the BIOS according to these instructions](http://arstechnica.com/gadgets/2014/02/new-intel-nuc-bios-update-fixes-steamos-other-linux-booting-problems/).
+We are often asked if it is acceptable to run SecureDrop on cloud servers (e.g. Amazon EC2, DigitalOcean, etc.) instead of on dedicated hardware. This request is generally motivated by a desire for cost savings and convenience; however, cloud servers are trivially accessible and manipulable by the provider that operates them. In the context of SecureDrop, this means that the provider could access extremely sensitive information, such as the plaintext of submissions or the encryption keys used to identify and access the Tor Hidden Services.
-### Secure Viewing Station (SVS)
+One of the core goals of SecureDrop is to avoid the potential compromise of sources through the compromise of third party communications providers. Therefore, we consider the use of virtualization for production instances of SecureDrop to be an unacceptable compromise and do not support it. While it is technically possible to modify SecureDrop's automated installation process to work on virtualized servers (for example, we do so to support our CI pipeline), you do so at your own risk and without our support or consent.
-The *Secure Viewing Station* is a machine that is kept offline and only ever used together with the Tails operating system. This machine will be used to generate GPG keys for all journalists with access to SecureDrop, as well as decrypt and view submitted documents. Since this machine will never touch the Internet or run an operating system other than Tails, it does not need a hard drive or network device. We recommend the following:
+#### Workstations
- * 1 x laptop without a hard drive, network interface card or wireless units.
- * 1 x encrypted, external hard drive to store documents on while working on a story.
- * 1 x offline printer.
+These components are necessary to do the initial installation of SecureDrop and to process submissions using the airgapped workflow.
-We recommend that you either buy or repurpose an old laptop. Another option is to buy an [Intel NUC](http://www.amazon.com/dp/B00F3F38O2/) with a power cord and [4 GB of memory](http://www.amazon.com/Crucial-PC3-12800-204-Pin-Notebook-CT2CP25664BF160B/dp/B005MWQ6WC/), but note that you will also need to get a monitor and a wired keyboard and mouse.
+- **Secure Viewing Station (SVS)**: 1 physical computer used as an airgap to decrypt and view submissions retrieved from the **Application Server**.
+ - The chosen hardware should be solely used for this purpose and should have any wireless networking hardware removed before use.
+- **Admin/Journalist Workstation(s)**: *At least 1* physical computer that is used as a workstation for SecureDrop admins and/or journalists.
+ - Each Admin and Journalist will have their own bootable Tails USB with an encrypted persistent partition that they will use to access SecureDrop. You will need at least one *workstation* to boot the Tails USBs, and may need more depending on: the number of admins/journalists you wish to grant access to SecureDrop, whether they can share the same workstation due to availability requirements, geographic distribution, etc.
+- **USB drive(s)**: *At least 2* USB drives to use as a bootable Tails USB for the **SVS** and the **Admin Tails**/**Journalist Tails**.
+ - If only one person is maintaining the system, you may use the same Tails instance as both the Admin Tails and the Journalist Tails; otherwise, we recommend buying 1 drive for each admin and each journalist.
+ - We also recommend buying two additional USBs to use as bootable backups of the **SVS** and **Admin Tails**.
+- **Two-factor authenticator**: Two-factor authentication is used when connecting to different parts of the SecureDrop system. Each admin and each journalist needs a two-factor authenticator. We currently support two options for two-factor authentication:
+ - Your existing smartphone with an app that computes TOTP codes (e.g. [Google Authenticator][])
+ - A dedicated hardware dongle that computes HOTP codes (e.g. a [YubiKey][]).
+- **Transfer Device(s)**: You need a mechanism to transfer encrypted submissions from the **Journalist Workstation** to the **SVS** to decrypt and view them. The most common transfer devices are DVD/CD-R discs and USB drives.
+ - From a security perspective, it is preferable to use write-once media such as DVD/CD-R discs because it eliminates the risk of exfiltration by malware that persists on the Transfer Device (e.g. [BadUSB][]).
+ - On the other hand, using write-once media to transfer data is typically inconvenient and time-consuming. You should consider your threat model and choose your transfer device accordingly.
+- **Monitor, Keyboard, Mouse**: You will need these to do the initial installation of Ubuntu on the Application and Monitor servers.
+ - Depending on your setup, you may also need these to work on the **SVS**.
+>>>>>>> release/0.3.5
-#### Printers
+[BadUSB]: https://srlabs.de/badusb/
+[Google Authenticator]: https://support.google.com/accounts/answer/1066447?hl=en
+[YubiKey]: https://www.yubico.com/products/yubikey-hardware/yubikey/
-Careful consideration should be given to the printer used with the SVS. Most printers today have wireless functionality (WiFi or Bluetooth connectivity) which should be **avoided** because it could be used to compromise the airgap.
+#### A note about recycled hardware
-Unfortunately, it is difficult to find printers that work with Tails, and it is increasingly difficult to find non-wireless printers at all. To assist you, we have compiled the following partial list of airgap-safe printers that have been tested and are known to work with Tails:
+If you cannot afford to purchase new hardware for your SecureDrop instance, we encourage you to consider re-purposing existing hardware to use with SecureDrop. If you are comfortable working with hardware, this is a great way to set up a SecureDrop instance for cheap.
-| Model | Testing Date | Tails Versions | Price (new) | Price (used) | Notes |
-|---------------------------|--------------|----------------|------------------|------------------|------------|
-| HP LaserJet 400 M401n | 06/2015 | 1.4 | $178.60 (Amazon) | $115.00 (Amazon) | Monochrome laser printer. Heavy (10 lbs.) When adding the printer in Tails, you need to set "Make and model" to "HP LaserJet 400 CUPS+Gutenprint v5.2.9". |
-| HP Deskjet 6940 | 04/2015 | 1.3.2 | $639.99 (Amazon) | $196.99 (Amazon) | Monochrome Inkjet printer |
+Since SecureDrop's throughput is significantly limited by the use of Tor for all connections, there is no need to use top of the line hardware for any of the servers or the firewall. In our experience, relatively recent recycled Dell desktops or servers are adequate for the SecureDrop servers, and recycled Thinkpad laptops work well for the Admin/Journalist workstations.
-If you know of another model of printer that fits our requirements and works with Tails, please submit a pull request to add it to this list.
+If you choose to use recycled hardware, you should of course consider whether or not it is trustworthy; making that determination is outside the scope of this document.
-### Tails and Transfer Devices
+### Optional Hardware
-The *Transfer Device* is the physical media used to transfer encrypted documents from the *Journalist Workstation* to the *Secure Viewing Station*. Additional devices are needed to run Tails. We recommend the following:
+This hardware is not *required* to run a SecureDrop instance, but most of it is still recommended.
- * 1 x physical media for the system administrator to run Tails on.
- * 1 x physical media for the system administrator to transfer files with.
- * 1 x physical media for the journalist to run Tails on.
- * 1 x physical media for the journalist to transfer files with.
- * 1 x physical media with Tails for the *Secure Viewing Station*.
- * 1 x physical media with Tails for the *Secure Viewing Station* (backup).
+- **Offline Printer**: It is often useful to print submissions from the **SVS** for review and annotation.
+ - To maintain the integrity of the airgap, this printer should be dedicated to use with the SVS, connected via a wired connection, and should not have any wireless communication capabilities.
+- **Offline Storage**: The **SVS** is booted from a Tails USB drive, which has an encrypted persistent volume but typically has a fairly limited storage capacity since it's just a USB drive. For installations that expect to receive a large volume of submissions, we recommend buying an external hard drive that can be encrypted and used to store submissions that have been been transferred from the **Application Server** to the **SVS**.
+- **Backup storage**: It's useful to run periodic backups of the servers in case of failure. We recommend buying an external hard drive that can be encrypted and used to store server backups.
+ - Since this drive will be connected to the **Admin Workstation** to perform backups, it should *not* be the same drive used for **Offline Storage**.
+- **Network Switch**: If your firewall has fewer than **four** NIC's, you will need an additional Ethernet switch to perform installation and maintenance tasks with the Admin Workstation. This switch is generally useful because it allows you to connect the **Admin Workstation** to your firewall's LAN port without taking down either of the SecureDrop servers.
-We recommend getting [16 GB Leef Supra](http://www.amazon.com/dp/B00FWQTBZ2/) USB sticks to run Tails on, and [4 GB Patriot](http://www.amazon.com/Swivel-Flash-Drive-Memory-Stick/dp/B00M1GYD90/) USB sticks to use when transferring files. Each journalist should have two USB sticks. For the Secure Viewing Station and backup, we recommend getting [Corsair 64 GB](http://www.amazon.com/dp/B00EM71W1S/) USB sticks.
+## Specific Hardware Recommendations
-Another alternative setup exists in which journalists do not transfer files on a USB stick, but instead use a CD-R or DVD-R. The encrypted documents are copied to the CD-R or DVD-R, then decrypted and read on the Secure Viewing Station. The disks are destroyed after first use. We recommend getting a [Samsung model burner](http://www.newegg.com/External-CD-DVD-Blu-Ray-Drives/SubCategory/ID-420) for this purpose.
+### Application/Monitor Servers
-### Two-factor authentication device
+The Intel NUC (Next Unit of Computing) is a capable, cheap, quiet, and low-powered device that can be used for the SecureDrop servers. There are a [variety of models][Intel NUCs] to choose from. We recommend the [D54250WYK][] because it has a mid-range CPU (Intel i5), the common Mini DisplayPort connector for the monitor, and USB 3.0 ports for faster OS installation and data transfer. Conveniently (for the paranoid), it supports wireless networking (Wifi and Bluetooth) through *optional* expansion cards not included by default - which means you don't have to spend time ripping out the wireless hardware before beginning the installation.
-Two-factor authentication is used when connecting to different parts of the SecureDrop system, including the *Document Interface*. We recommend the following for each administrator or journalist with access to the system:
+[Intel NUCs]: https://www-ssl.intel.com/content/www/us/en/nuc/products-overview.html
+[D54250WYK]: https://www-ssl.intel.com/content/www/us/en/nuc/nuc-kit-d54250wyk.html
- * 1 x two-factor authentication device
+If you purchase the NUC from [Amazon](http://www.amazon.com/Intel-D54250WYK-DisplayPort-Graphics-i5-4250U/dp/B00F3F38O2/), make sure you click "With Powercord" to have one included in the package.
-We recommend using either a smartphone capable of running [Google Authenticator](https://support.google.com/accounts/answer/1066447?hl=en) or a [YubiKey](https://www.yubico.com/products/yubikey-hardware/yubikey/).
+Note that the NUCs come as kits and some assembly is required. You will need to purchase the RAM and hard drive separately for each NUC and insert the cards into the NUC before it can be used. We recommend:
-### Network firewall
+- 2 [240 GB SSDs](http://www.amazon.com/dp/B00BQ8RKT4/)
+- A [4 GB (4GBx2) memory kit](http://www.amazon.com/Crucial-PC3-12800-204-Pin-Notebook-CT2CP25664BF160B/dp/B005MWQ6WC/)
+ - You can put one 4GB memory stick in each of the servers.
-An important part of SecureDrop's security model involves segmenting the infrastructure from the Internet and/or the corporate environment. For this reason, we recommend that you get:
+*Warning:* The D54250WYK has recently been [EOL'ed by Intel](http://ark.intel.com/products/series/70407/Intel-NUC-Boards-and-Kits). Availability and prices may be subject to change. We are working on analyzing alternative recommendations, but there are no immediately obvious alternatives that share the benefits of the D54250WYK (primarily, the lack of integrated wireless networking hardware).
- * 1 x firewall with pfSense and minimum three NICs.
+#### Potential BIOS issue
-We recommend getting a Netgate firewall with pfSense pre-installed, and you can choose from a firewall with [2 GB of system memory](http://store.netgate.com/NetgateAPU2.aspx) or one with [4 GB of system memory](http://store.netgate.com/APU4.aspx).
+An earlier release of SecureDrop (0.2.1) was based on Ubuntu 12.04.1 (precise). We encountered issues installing this version of Ubuntu on some types of Intel NUCs. The problem manifested after installing Ubuntu on the NUC. The installation would complete, but rebooting after installation would not succeed.
-### Network Switch
+We have not encountered this or any similar problems in testing the current release series (0.3.x) with the Intel NUCs. Since 0.3 is based on Ubuntu 14.04.1 (trusty), we believe the issue has been resolved in the newer release of Ubuntu.
+
+If you do encounter issues booting Ubuntu on the NUCs, try updating the BIOS according to [these instructions](http://arstechnica.com/gadgets/2014/02/new-intel-nuc-bios-update-fixes-steamos-other-linux-booting-problems/).
+
+### Secure Viewing Station (SVS)
+
+The *Secure Viewing Station* is a machine that is kept offline and only ever used together with the Tails operating system. This machine will be used to generate the GPG keys used by SecureDrop to encrypt submissions, as well as decrypt and view submissions. Since this machine will never touch the Internet or run an operating system other than Tails, it does not need a hard drive or network device; in fact, we recommend removing these components if they are already present.
+
+One option is to buy a Linux-compatible laptop such as a [Lenovo Thinkpad](http://shop.lenovo.com/us/en/laptops/thinkpad/t-series/t540p/). You can also repurpose an old laptop if you have one available.
+
+Another option is to buy an [Intel NUC D54250WYK](http://www.amazon.com/Intel-D54250WYK-DisplayPort-Graphics-i5-4250U/dp/B00F3F38O2/) (same model as the servers) with a power cord and [4 GB of memory](http://www.amazon.com/Crucial-PC3-12800-204-Pin-Notebook-CT2CP25664BF160B/dp/B005MWQ6WC/), but note that you will also need to get a monitor and a wired keyboard and mouse. It does not come with a hard drive or wireless networking hardware by default, so you will not need to remove these components before using it. However, we do recommend taping over the IR receiver with some opaque masking tape.
+
+Note that if you do want to use a NUC for the SVS, you *should not* use any of the new generation of NUCs, which have names starting with "NUC5" (e.g. [NUC5i5RYK](https://www-ssl.intel.com/content/www/us/en/nuc/nuc-kit-nuc5i5ryk.html).. These NUCs have wireless networking built into the motherboard, and it is impossible to physically remove.
+
+#### A note about Hi-DPI displays
-If you firewall has fewer than **four** NICs, you will need an additional Ethernet switch to perform installation and maintenance tasks with the Admin Workstation. This switch is generally useful because it allows you to connect to your firewall's LAN port without taking down either of the SecureDrop servers, which is useful if you want to perform maintenance tasks from the Admin Workstation on the SecureDrop installation or the firewall configuration. This is possible without the switch if your firewall has enough ports, but you will need to perform some additional initial firewall setup to get this to work.
+The current version of Tails (1.5.1) is based on Debian 7 ("Wheezy"), which does not have good support for Hi-DPI displays. Examples of laptops that use this type of display are MacBook/MacBook Pros with the Retina display, or the Dell Precision M3800. We *do not recommend* using such laptops with any of the components that run Tails (the SVS, Admin Workstation, and Journalist Workstation). While it is possible to use them, the screen resolution will not be scaled correctly. Typically, this means everything will be really tiny, bordering on unreadable.
-We recommend getting a [5-port Netgear ProSafe Ethernet Switch](http://www.amazon.com/NETGEAR-ProSafe-Gigabit-Ethernet-Desktop/dp/B0000BVYT3/) or similar.
+Until the upcoming version of Tails (2.x, based on Debian 8) comes out, use standard resolution displays with Tails.
-## Appendix
+### Tails USBs
-### Notes on the NUCs
+We *strongly recommend* getting USB 3.0-compatible drives to run Tails from. The transfer speeds are significantly faster than USB 2.0, which means a live operating system booting from one will be much faster and more responsive.
-There are a variety of available NUCs, and each different model supports different hardware specs and peripheral connectors. For hardware testing, we have been using:
+You will need *at least* an 8GB drive to run Tails with an encrypted persistent partition. We recommend getting something in the 16-64GB range so you can handle large amounts of submissions without hassle. Anything more than that is probably overkill.
-#### D34010WYK
+Other than that, the choice of USB drive depends on capacity, form factor, cost, and a host of other factors. One option that we like is the [Leef Supra](http://www.amazon.com/Leef-Supra-PrimeGrade-Memory-Silver/dp/B00FWQMKA0).
-[Amazon link w/ picture](http://www.amazon.com/Intel-Computing-BOXD34010WYK1-Black-White/dp/B00H3YT886/)
+### Transfer Device
-We have been using one for the Secure Viewing Station (SVS), which is air-gapped and never connected to the Internet, and one for the Admin Workstation, which is Internet-connected and is used to run the Ansible playbooks. You could also use an existing workstation, or a recycled machine, for this purpose, assuming you feel confident that this machine has not been physically compromised in any way.
+If you are using USBs for the transfer device, the same general recommendations for the Tails USBs also apply. One thing to consider is that you are going to have *a lot* of USB drives to keep track of, so you should consider how you will label or identify them and buy drives accordingly. Drives that are physically larger are often easier to label (e.g. with tape or a label from a labelmaker).
+
+If you are using DVD/CD-R's for the transfer device, you will need *two* DVD/CD writers: one for burning DVDs from the **Journalist Workstation**, and one for reading the burned DVDs on the **SVS**. We recommend using two separate drives instead of sharing the same drive to avoid the potential risk of malware exfiltrating data by compromising the drive's firmware. We've found the DVD/CD writers from Samsung and LG to work reasonably well, you can find some examples [here](http://www.newegg.com/External-CD-DVD-Blu-Ray-Drives/SubCategory/ID-420).
+
+Finally, you will need a stack of blank DVD/CD-R's, which you can buy anywhere.
+
+### Network Firewall
+
+We recommend the [pfSense SG-2440](http://store.pfsense.org/SG-2440/).
+
+### Network Switch
+
+This is optional, for people who are using a firewall with less than 4 ports (the recommended firewall has 4 ports). Any old switch with more than 3 ports will do, such as the [5-port Netgear ProSafe Ethernet Switch](http://www.amazon.com/NETGEAR-ProSafe-Gigabit-Ethernet-Desktop/dp/B0000BVYT3/).
+
+### Printers
+
+Careful consideration should be given to the printer used with the SVS. Most printers today have wireless functionality (WiFi or Bluetooth connectivity) which should be **avoided** because it could be used to compromise the airgap.
+
+Unfortunately, it is difficult to find printers that work with Tails, and it is increasingly difficult to find non-wireless printers at all. To assist you, we have compiled the following partial list of airgap-safe printers that have been tested and are known to work with Tails:
+
+| Model | Testing Date | Tails Versions | Price (new) | Price (used) | Notes |
+|---------------------------|--------------|----------------|------------------|------------------|------------|
+| HP LaserJet 400 M401n | 06/2015 | 1.4 | $178.60 (Amazon) | $115.00 (Amazon) | Monochrome laser printer. Heavy (10 lbs.) When adding the printer in Tails, you need to set "Make and model" to "HP LaserJet 400 CUPS+Gutenprint v5.2.9". |
+| HP Deskjet 6940 | 04/2015 | 1.3.2 | $639.99 (Amazon) | $196.99 (Amazon) | Monochrome Inkjet printer |
+
+If you know of another model of printer that fits our requirements and works with Tails, please submit a pull request to add it to this list.
-This machine has USB 3.0, which is nice for booting live USBs quickly and for transferring large files. It has two available display connectors: Mini-HDMI and DisplayPort.
+### Monitor, Keyboard, Mouse
-#### DC3217IYE
+We don't have anything specific to recommend when it comes to displays. You should make sure you know what monitor cable you need for the servers, since you will need to connect them to a monitor to do the initial Ubuntu installation.
-[Amazon link w/ picture](http://www.amazon.com/Intel-Computing-Gigabit-i3-3217U-DC3217IYE/dp/B0093LINVK)
+You should use a wired (USB) keyboard and mouse, not wireless.
-We have been using two of these for the Application and Monitor servers (app and mon). They only have USB 2.0, which is not so bad because the Linux installation using live USB is a one-time process and you rarely transfer files directly from the servers. They also only have one available display connector: HDMI.
diff --git a/docs/images/firewall/admin_workstation_static_ip_configuration.png b/docs/images/firewall/admin_workstation_static_ip_configuration.png
new file mode 100755
index 0000000000..f3594c2efd
Binary files /dev/null and b/docs/images/firewall/admin_workstation_static_ip_configuration.png differ
diff --git a/docs/images/firewall/edit_network_connection.png b/docs/images/firewall/edit_network_connection.png
new file mode 100755
index 0000000000..c7cf62a55c
Binary files /dev/null and b/docs/images/firewall/edit_network_connection.png differ
diff --git a/docs/images/firewall/edit_wired_connection.png b/docs/images/firewall/edit_wired_connection.png
deleted file mode 100755
index 5a5c81e10a..0000000000
Binary files a/docs/images/firewall/edit_wired_connection.png and /dev/null differ
diff --git a/docs/images/firewall/editing_wired_connection.png b/docs/images/firewall/editing_wired_connection.png
deleted file mode 100755
index 32fd143ea4..0000000000
Binary files a/docs/images/firewall/editing_wired_connection.png and /dev/null differ
diff --git a/docs/images/firewall/invoke_auto_upgrade.png b/docs/images/firewall/invoke_auto_upgrade.png
new file mode 100755
index 0000000000..c710092434
Binary files /dev/null and b/docs/images/firewall/invoke_auto_upgrade.png differ
diff --git a/docs/images/firewall/ip_aliases_with_opt2.png b/docs/images/firewall/ip_aliases_with_opt2.png
new file mode 100755
index 0000000000..84fd875220
Binary files /dev/null and b/docs/images/firewall/ip_aliases_with_opt2.png differ
diff --git a/docs/images/firewall/lan_rules.png b/docs/images/firewall/lan_rules.png
index 247e534276..d2e3247e34 100644
Binary files a/docs/images/firewall/lan_rules.png and b/docs/images/firewall/lan_rules.png differ
diff --git a/docs/images/firewall/lan_rules_with_opt2.png b/docs/images/firewall/lan_rules_with_opt2.png
new file mode 100755
index 0000000000..e65575be18
Binary files /dev/null and b/docs/images/firewall/lan_rules_with_opt2.png differ
diff --git a/docs/images/firewall/opt1_rules.png b/docs/images/firewall/opt1_rules.png
index 55e15d52df..fda85d09f9 100644
Binary files a/docs/images/firewall/opt1_rules.png and b/docs/images/firewall/opt1_rules.png differ
diff --git a/docs/images/firewall/opt1_rules_with_opt2.png b/docs/images/firewall/opt1_rules_with_opt2.png
new file mode 100644
index 0000000000..d06e8db0e8
Binary files /dev/null and b/docs/images/firewall/opt1_rules_with_opt2.png differ
diff --git a/docs/images/firewall/opt2_rules.png b/docs/images/firewall/opt2_rules.png
new file mode 100644
index 0000000000..d0eb98f17c
Binary files /dev/null and b/docs/images/firewall/opt2_rules.png differ
diff --git a/docs/images/firewall/pfsense_update_available.png b/docs/images/firewall/pfsense_update_available.png
new file mode 100755
index 0000000000..d51f9048b1
Binary files /dev/null and b/docs/images/firewall/pfsense_update_available.png differ
diff --git a/docs/install.md b/docs/install.md
index e4013ac659..0bf0db3f05 100644
--- 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 [email protected].
diff --git a/docs/network_firewall.md b/docs/network_firewall.md
index 937159975c..298967b2d8 100644
--- a/docs/network_firewall.md
+++ b/docs/network_firewall.md
@@ -6,57 +6,93 @@ Network Firewall Setup Guide
**Table of Contents** *generated with [DocToc](http://doctoc.herokuapp.com/)*
- [Before you begin](#before-you-begin)
+ - [3 NIC configuration](#3-nic-configuration)
+ - [4 NIC configuration](#4-nic-configuration)
- [Initial Setup](#initial-setup)
- - [Assign interfaces](#assign-interfaces)
- [Initial configuration](#initial-configuration)
- [Connect to the pfSense WebGUI](#connect-to-the-pfsense-webgui)
- [Setup Wizard](#setup-wizard)
- [Connect Interfaces and Test Connectivity](#connect-interfaces-and-test-connectivity)
- [SecureDrop-specific Configuration](#securedrop-specific-configuration)
- - [Set up OPT1](#set-up-opt1)
- [Disable DHCP on the LAN](#disable-dhcp-on-the-lan)
- [Disabling DHCP](#disabling-dhcp)
- [Assigning a static IP address to the Admin Workstation](#assigning-a-static-ip-address-to-the-admin-workstation)
+ - [Troubleshooting: DNS servers and the Unsafe Browser](#troubleshooting-dns-servers-and-the-unsafe-browser)
+ - [Set up OPT1](#set-up-opt1)
+ - [Set up OPT2](#set-up-opt2)
- [Set up the network firewall rules](#set-up-the-network-firewall-rules)
- [Example Screenshots](#example-screenshots)
+ - [3 NICs Configuration](#3-nics-configuration)
+ - [4 NICs Configuration](#4-nics-configuration)
+ - [Keeping pfSense Up to Date](#keeping-pfsense-up-to-date)
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-Unfortunately, due to the wide variety of firewalls that may be used, we do not provide specific instructions to cover every type or variation in software or hardware.
+Unfortunately, due to the wide variety of firewalls that may be used, we do not provide specific instructions to cover every type or variation in software or hardware. This guide is based on pfSense, and assumes your firewall hardware has at least three interfaces: WAN, LAN, and OPT1. For hardware, you can build your own network firewall (not covered in this guide) and [install pfSense](https://doc.pfsense.org/index.php/Installing_pfSense) on it. For most installations, we recommend buying a dedicated firewall appliance with pfSense pre-installed, such as the one recommended in the Hardware Guide.
+
+We used to recommend the 3-NIC [Netgate APU 2](http://store.netgate.com/NetgateAPU2.aspx), but it has since been discontinued. We currently recommend the [pfSense SG-2440](http://store.pfsense.org/SG-2440/), which has 4 interfaces: WAN, LAN, OPT1, and OPT2. This guide covers both the old 3-NIC configuration, for existing installs that are still using it, and the 4-NIC configuration recommended for new installs.
+
+If your firewall only has 3 NICs (WAN, LAN, and OPT1), you will need to use a switch on the OPT1 interface to connect the Admin Workstation for the initial installation. If your firewall has 4 NICs (WAN, LAN, OPT1, and OPT2), a switch is not necessary.
-This guide will focus on pfSense, and assumes your firewall has at least three interfaces: WAN, LAN, and OPT1. These are the default interfaces on the recommended Netgate firewall, and it should be easy to configure any pfSense firewall with 3 or more NICs this way.
+If you are new to pfSense or firewall management in general, we recommend the following resources:
-To avoid duplication, this guide refers to sections of the [pfSense Guide](http://data.sfb.bg.ac.rs/sftp/bojan.radic/Knjige/Guide_pfsense.pdf), so you will want to have that handy.
+- [Official pfSense Wiki](https://doc.pfsense.org/index.php/Main_Page)
+- [pfSense: The Definitive Guide](http://www.amazon.com/pfSense-Definitive-Guide-Christopher-Buechler-ebook/dp/B004OYTMPC)
+ - *Note:* This guide is now slightly out of date, although we found it to be a useful reference approximately 1 year ago. To get the latest version of this book, you need to become a [pfSense Gold Member](https://www.pfsense.org/our-services/gold-membership.html).
Before you begin
----------------
-First, consider how the firewall will be connected to the Internet. You need to be able to provision two unique subnets for SecureDrop: the app subnet and the monitor subnet. There are a number of possible ways to configure this, and the best way will depend on the network that you are connecting to.
+First, consider how the firewall will be connected to the Internet. You will need to provision several unique subnets, which should not conflict with the network configuration on the WAN interface. If you are unsure, consult your local sysadmin.
+
+Note that many firewalls, including the recommended Netgate pfSense, automatically set up the LAN interface on `192.168.1.1/24`. This particular private network is also a very common choice for home and office routers. If you are connecting the firewall to a router with the same subnet (common in a small office, home, or testing environment), you will probably be unable to connect to the network at first. However, you will be able to connect from the LAN to the pfSense WebGUI configuration wizard, and from there you will be able to configure the network so it is working correctly.
+
+#### 3 NIC configuration
+
+If your firewall has 3 NICs, we will refer to them as WAN, LAN, and OPT1. WAN is used to connect to the external network. LAN and OPT1 are used for the Application and Monitor Servers, respectively. Putting them on separate interfaces allows us to use the network firewall to filter and monitor the traffic *between* them.
+
+In addition, you will need to be able to connect the Admin Workstation to this setup for the initial installation. Before SecureDrop is installed, the only way to connect to the servers is via SSH over the local network, so the Admin Workstation needs to be directly connected. Once it is installed, SSH will be available remotely (as an authenticated Tor Hidden Servce) and you will not necessarily need to connect the Admin Workstation directly to adminster the servers - although you will still need to connect it directly to administer the network firewall. Since there isn't another NIC to connect the Admin Workstation to, we recommend using a small switch on the LAN (the specific choice of interface doesn't matter, but we recommend using the LAN to stay consistent with the rest of this guide) so you can connect both the Admin Workstation and the Application Server.
+
+Depending on your network configuration, you should define the following values before continuing. For the examples in this guide, we have chosen:
+
+* Admin/App Gateway: `10.20.1.1`
+* Admin/App Subnet: `10.20.1.0/24`
+* App Server: `10.20.1.2`
+* Admin Workstation: `10.20.1.3`
+
+<!-- -->
+
+* Monitor Subnet: `10.20.2.0/24`
+* Monitor Gateway: `10.20.2.1`
+* Monitor Server: `10.20.2.2`
+
+#### 4 NIC configuration
+
+If your firewall has 4 NICs, we refer to them as WAN, LAN, OPT1, and OPT2. In this case, we can now use a dedicated port on the network firewall for each component of SecureDrop (Application Server, Monitor Server, and Admin Workstation), so you do not need a switch like you do for the 3-NIC configuration.
+
+Depending on your network configuration, you should define the following values before continuing. For the examples in this guide, we have chosen:
-Note that many firewalls, including the recommended Netgate pfSense, automatically set up the LAN interface on 192.168.1.1/24. The `/24` subnet is a very common choice for home routers. If you are connecting the firewall to a router with the same subnet (common in a small office, home, or testing environment), you will probably be unable to connect to the network at first. However, you will be able to connect from the LAN to the pfSense WebGUI configuration wizard, and from there you will be able to configure the network so it is working correctly.
+* Admin Subnet: `10.20.1.0/24`
+* Admin Gateway: `10.20.1.1`
+* Admin Workstation: `10.20.1.2`
-The app subnet will need at least three IP addresses: one for the gateway, one for the app server, and one for the admin workstation. The monitor subnet will need at least two IP addresses: one for the gateway and one for the monitor server.
+<!-- -->
-We assume that you have examined your network configuration and have selected two appropriate subnets. We will refer to your chosen subnets as "App Subnet" and "Monitor Subnet" throughout the rest of the documentation. For the examples in the documentation, we have chosen:
+* App Subnet: `10.20.2.0/24`
+* App Gateway: `10.20.2.1`
+* App Server: `10.20.2.2`
-* App Subnet: 10.20.1.0/24
-* App Gateway: 10.20.1.1
-* App Server: 10.20.1.2
-* Admin Workstation: 10.20.1.3
+<!-- -->
-* Monitor Subnet: 10.20.2.0/24
-* Monitor Gateway: 10.20.2.1
-* Monitor Server: 10.20.2.2
+* Monitor Subnet: `10.20.3.0/24`
+* Monitor Gateway: `10.20.3.1`
+* Monitor Server: `10.20.3.2`
Initial Setup
-------------
Unpack the firewall, connect power, and power on.
-### Assign interfaces
-
-Section 3.2.3, "Assigning Interfaces", of the pfSense Guide. Some firewalls, like the Netgate recommended in the Hardware Guide, have this set up already, in which case you can skip this step.
-
### Initial configuration
We will use the pfSense WebGUI to do the initial configuration of the network firewall.
@@ -65,36 +101,43 @@ We will use the pfSense WebGUI to do the initial configuration of the network fi
1. Boot the Admin Workstation into Tails from the Admin Live USB.
-2. Connect the Admin Workstation to the switch on the LAN.
+2. Connect the Admin Workstation to the LAN interface. You should see
+ a popup notification in Tails that says "Connection Established".
+
+ - Make sure your *only* active connections is the one you just
+ established with the network firewall. If you are connected to
+ another network at the same time (e.g. a wireless network), you
+ may encounter problems trying to connect the pfSense WebGUI.
3. Launch the *Unsafe Browser*, *Applications → Internet → Unsafe Browser*.
- 
+ 
- 1. Note that the *Unsafe Browser* is, as the name suggests, **unsafe** (its
- traffic is not routed through Tor). However, it is the only option in
- this context because Tails [intentionally][tails_issue_7976] disables
- LAN access in the *Tor Browser*.
+ 1. Note that the *Unsafe Browser* is, as the name suggests,
+ **unsafe** (its traffic is not routed through Tor). However, it
+ is the only option in this context because Tails
+ [intentionally][tails_issue_7976] disables LAN access in the
+ *Tor Browser*.
2. A dialog will ask "Do you really want to launch the Unsafe Browser?". Click **Launch**.
- 
+ 
3. You will see a pop-up notification that says "Starting the Unsafe Browser..."
- 
+ 
- 4. After a few seconds, the Unsafe Browser should launch. The window has a
- bright red border to remind you to be careful when using it. You should
- close it once you're done configuring the firewall and use the Tor
- Browser for any other web browsing you might do on the Admin
- Workstation.
+ 4. After a few seconds, the Unsafe Browser should launch. The
+ window has a bright red border to remind you to be careful when
+ using it. You should close it once you're done configuring the
+ firewall and use the Tor Browser for any other web browsing you
+ might do on the Admin Workstation.
- 
+ 
4. Navigate to the pfSense GUI in the *Unsafe Browser*: `https://192.168.1.1`
-5. The firewall uses a self-signed certificate, so you will see a "This Connection Is Untrusted" warning when you connect. This is expected (see Section 4.5.6 of the pfSense Guide). You can safely continue by clicking "I Understand the Risks", "Add Exception...", and "Confirm Security Exception."
+5. The firewall uses a self-signed certificate, so you will see a "This Connection Is Untrusted" warning when you connect. This is expected. You can safely continue by clicking "I Understand the Risks", "Add Exception...", and "Confirm Security Exception."
6. You should see the login page for the pfSense GUI. Log in with the default username and password (admin / pfsense).
@@ -102,29 +145,29 @@ We will use the pfSense WebGUI to do the initial configuration of the network fi
#### Setup Wizard
-If you're setting up a brand new (or recently factory reset) router, pfSense will start you on the Setup Wizard. Click next, then next again. Don't sign up for a pfSense Gold subscription.
+If you're setting up a brand new (or recently factory reset) router, logging in to the pfSense WebGUI will automatically start the Setup Wizard. Click next, then next again. Don't sign up for a pfSense Gold subscription (unless you want to).
-On the "General Information" page, we recommend leaving your hostname as the default (pfSense). There is no relevant domain for SecureDrop, so we recommend setting this to "securedrop.local" or something similar. Use whatever DNS servers you wish. If you don't know what DNS servers to use, we recommend using Google's DNS servers: `8.8.8.8` and `8.8.4.4`. Click Next.
+On the "General Information" page, we recommend leaving your hostname as the default (pfSense). There is no relevant domain for SecureDrop, so we recommend setting this to `securedrop.local` or something similar. Use your preferred DNS servers. If you don't know what DNS servers to use, we recommend using Google's DNS servers: `8.8.8.8` and `8.8.4.4`. Click Next.
Leave the defaults for "Time Server Information". Click Next.
On "Configure WAN Interface", enter the appropriate configuration for your network. Consult your local sysadmin if you are unsure what to enter here. For many environments, the default of DHCP will work and the rest of the fields can be left blank. Click Next.
-For "Configure LAN Interface", set the IP address and subnet mask of the Application Subnet for the LAN interface. Be sure that the CIDR prefix correctly corresponds to your subnet mask-- pfsense should automatically calculate this for you, but you should always check. In most cases, your CIDR prefix should be `/24`. Click Next.
+For "Configure LAN Interface", use the IP address and subnet mask of the *gateway* for the **Admin Subnet**. Click Next.
-Set a strong admin password. We recommend generating a random password with KeePassX, and saving it in the Tails Persistent folder using the provided KeePassX database template. Click Next.
+Set a strong admin password. We recommend generating a strong password with KeePassX, and saving it in the Tails Persistent folder using the provided KeePassX database template. Click Next.
-Click Reload.
+Click Reload. Once the reload completes and the web page refreshes, click the corresponding "here" link to "continue on to the pfSense webConfigurator".
-If you changed the LAN Interface settings, you will no longer be able to connect after reloading the firewall and the next request will probably time out. This is not a problem - the firewall has reloaded and is working correctly. To connect to the new LAN interface, unplug and reconnect your network cable to have a new network address assigned to you via DHCP. Note that if you used a subnet with fewer addresses than `/24`, the default DHCP configuration in pfSense may not work. In this case, you should assign the Admin Workstation a static IP address that is known to be in the subnet to continue.
+At this point, since you (probably) changed the LAN subnet settings from their defaults, you will no longer be able to connect after reloading the firewall and the next request will probably time out. This is not an error - the firewall has reloaded and is working correctly. To connect to the new LAN interface, unplug and reconnect your network cable to get a new network address assigned via DHCP. Note that if you used a subnet with fewer addresses than `/24`, the default DHCP configuration in pfSense may not work. In this case, you should assign the Admin Workstation a static IP address that is known to be in the subnet to continue.
-Now the WebGUI will be available on the App Gateway address. Navigate to `https://<App Gateway IP>` in the *Unsafe Browser*, and do the same dance as before to log in to the pfSense WebGUI and continue configuring the firewall.
+Now the WebGUI will be available on the Admin Gateway address. Navigate to `https://<Admin Gateway IP>` in the *Unsafe Browser*, and do the same dance as before to log in to the pfSense WebGUI. Once you've logged in to the WebGUI, you are ready to continue configuring the firewall.
#### Connect Interfaces and Test Connectivity
-Now that the initial configuration is completed, you can connect the WAN port without potentially conflicting with the default LAN settings (as explained earlier). Connect the WAN port to the external network. You can watch the WAN entry in the Interfaces table on the pfSense WebGUI homepage to see as it changes from down (red arrow pointing down) to up (green arrow pointing up). The WAN's IP address will be shown once it comes up.
+Now that the initial configuration is completed, you can connect the WAN port without potentially conflicting with the default LAN settings (as explained earlier). Connect the WAN port to the external network. You can watch the WAN entry in the Interfaces table on the pfSense WebGUI homepage to see as it changes from down (red arrow pointing down) to up (green arrow pointing up). This usually takes several seconds. The WAN's IP address will be shown once it comes up.
-Finally, test connectivity to make sure you are able to connect to the Internet through the WAN. The easiest way to do this is to use ping (Diagnostics → Ping in the WebGUI).
+Finally, test connectivity to make sure you are able to connect to the Internet through the WAN. The easiest way to do this is to use ping (Diagnostics → Ping in the WebGUI). Enter an external hostname or IP that you expect to be up (e.g. `google.com`) and click "Ping".
SecureDrop-specific Configuration
---------------------------------
@@ -136,15 +179,6 @@ SecureDrop uses the firewall to achieve two primary goals:
In order to use the firewall to isolate the app and monitor servers from each other, we need to connect them to separate interfaces, and then set up firewall rules that allow them to communicate.
-### Set up OPT1
-
-We set up the LAN interface during the initial configuration. We now need to set up the OPT1 interface. Start by connecting the Monitor Server to the OPT1 port. Then use the WebGUI to configure the OPT1 interface. Go to `Interfaces → OPT1`, and check the box to "Enable Interface". Use these settings:
-
-- IPv4 Configuration Type: Static IPv4
-- IPv4 Address: Monitor Gateway
-
-Once again, be sure that the CIDR prefix correctly corresponds to your subnet mask (and should be `/24` in most cases). Pfsense should automatically calculate this for you, but you should always check. Leave everything else as the default. Save and Apply Changes.
-
### Disable DHCP on the LAN
pfSense runs a DHCP server on the LAN interface by default. At this stage in the documentation, the Admin Workstation has an IP address assigned via that DHCP server. You can easily check your current IP address by *right-clicking* the networking icon (a blue cable going in to a white jack) in the top right of the menu bar, and choosing "Connection Information".
@@ -155,7 +189,7 @@ In order to tighten the firewall rules as much as possible, we recommend disabli
#### Disabling DHCP
-To disable DHCP, navigate to "Services → DHCP Server". Uncheck the box to "Enable DHCP servers on LAN interface", scroll down, and click the Save button.
+To disable DHCP, navigate to "Services → DHCP Server". Uncheck the box to "Enable DHCP server on LAN interface", scroll down, and click the Save button.
#### Assigning a static IP address to the Admin Workstation
@@ -165,43 +199,96 @@ Start by *right-clicking* the networking icon in the top right of the menu bar,
-Select "Wired connection" from the list and click the "Edit..." button.
+Select the name of the current connection from the list and click the "Edit..." button.
-
+
Change to the "IPv4 Settings" tab. Change "Method:" from "Automatic (DHCP)" to "Manual". Click the Add button and fill in the static networking information for the Admin Workstation.
-
+*Note:* The Unsafe Browser will not launch when using a manual network configuration if it does not have DNS servers configured. This is technically unnecessary for our use case because we are only using it to access IP addresses on the LAN, and do not need to resolve anything with DNS. Nonetheless, you should configure some DNS servers here so you can continue to use the Unsafe Browser to access the WebGUI in future sessions. We recommend keeping it simple and using the same DNS servers that you used for the network firewall in the setup wizard.
+
+
Click "Save...". If the network does not come up within 15 seconds or so, try disconnecting and reconnecting your network cable to trigger the change. You will need you have succeeded in connecting with your new static IP when you see a pop-up notification that says "Tor is ready. You can now access the Internet".
-### Set up the network firewall rules
+##### Troubleshooting: DNS servers and the Unsafe Browser
-Since there are a variety of firewalls with different configuration interfaces and underlying sets of software, we cannot provide a set of network firewall rules to match every use case. Instead, we provide a firewall rules template in `install_files/network_firewall/rules`. This template is written in the iptables format, which you will need to manually translate for your firewall and preferred configuration method.
+After saving the new network configuration, you may still encounter the "No DNS servers configured" error when trying to launch the Unsafe Browser. If you encounter this issue, you can resolve it by disconnecting from the network and then reconnecting, which causes the network configuration to be reloaded.
-For pfSense, see Section 6 of the pfSense Guide for information on setting up firewall rules through the WebGUI. Here are some tips on interpreting the rules template for pfSense:
+To do this, click the network icon in the system toolbar, and click "Disconnect" under the bolded name of the currently active network connection. After it disconnects, click the network icon again and click the name of the connection to reconnect. You should see a popup notification that says "Connection Established", followed several seconds later by a "Tor is ready" popup notification.
-1. Create aliases for the repeated values (IPs and ports).
-2. pfSense is a stateful firewall, which means that you don't need corresponding rules for the iptables rules that allow incoming traffic in response to outgoing traffic (`--state ESTABLISHED,RELATED`). pfSense does this for you automatically.
-3. You should create the rules on the interface where the traffic originates from. The easy way to do this is look at the sources (`-s`) of each of the iptables rules, and create that rule on the corresponding interface:
+### Set up OPT1
- * `-s APP_IP` → `LAN`
- * `-s MONITOR_IP` → `OPT1`
+We set up the LAN interface during the initial configuration. We now need to set up the OPT1 interface for the Application Server. Start by connecting the Application Server to the OPT1 port. Then use the WebGUI to configure the OPT1 interface. Go to `Interfaces → OPT1`, and check the box to "Enable Interface". Use these settings:
+- IPv4 Configuration Type: Static IPv4
+- IPv4 Address: Application Gateway
+
+Make sure that the CIDR routing prefix is correct. Leave everything else as the default. Save and Apply Changes.
+
+### Set up OPT2
+
+If you have 4 NICs, you will have to enable the OPT2 interface. Go to `Interfaces → OPT2`, and check the box to "Enable Interface". OPT2 interface is set up similarly to how we set up OPT1 in the previous section. Use these settings:
+
+- IPv4 Configuration Type: Static IPv4
+- IPv4 Address: Monitor Gateway
+
+Make sure that the CIDR routing prefix is correct. Leave everything else as the default. Save and Apply Changes.
+
+### Set up the network firewall rules
+
+Since there are a variety of firewalls with different configuration interfaces and underlying sets of software, we cannot provide a set of network firewall rules to match every use case.
+
+This document is currently geared towards pfSense configured using the WebGUI; as a result, the easiest way to set up your firewall rules is to look at the screenshots of a correctly configured firewall below and edit the interfaces, aliases, and firewall rules on your firewall to match them.
+
+Here are some general tips for setting up pfSense firewall rules:
+
+1. Create aliases for the repeated values (IPs and ports).
+2. pfSense is a stateful firewall, which means that you don't need corresponding rules to allow incoming traffic in response to outgoing traffic (like you would in, e.g. iptables with `--state ESTABLISHED,RELATED`). pfSense does this for you automatically.
+3. You should create the rules *on the interface where the traffic originates*.
4. Make sure you delete the default "allow all" rule on the LAN interface. Leave the "Anti-Lockout" rule enabled.
-5. Any traffic that is not explicitly passed is logged and dropped by default in pfSense, so you don't need to add explicit rules (`LOGNDROP`) for that.
-6. Since some of the rules are almost identical except for whether they allow traffic from the App Server or the Monitor Server (`-s MONITOR_IP,APP_IP`), you can use the "add a new rule based on this one" button to save time creating a copy of the rule on the other interface.
-7. If you are having trouble with connections, the firewall logs can be very helpful. You can find them in the WebGUI in *Status → System Logs → Firewall*.
+5. Any traffic that is not explicitly passed is logged and dropped by default in pfSense, so you don't need to add explicit rules (iptables `LOGNDROP`) for that.
+6. Since some of the rules are almost identical except for whether they allow traffic from the App Server or the Monitor Server, you can use the "add a new rule based on this one" button to save time creating a copy of the rule on the other interface.
+7. If you are troubleshooting connectivity, the firewall logs can be very helpful. You can find them in the WebGUI in *Status → System Logs → Firewall*.
-We recognize that this process is cumbersome and may be difficult for people inexperienced in managing networks to understand. We are working on automating much of this for the next SecureDrop release. If you're unsure how to set up your firewall, use the screenshots in the next section as your guide.
+We recognize that this process is cumbersome and may be difficult for people inexperienced in managing a firewall. We are working on automating much of this for an upcoming SecureDrop release. If you're unsure how to set up your firewall, use the screenshots in the next section as your guide.
+
+For more experienced pfSense users, we have included a copy of the `.xml` backup from a correctly configured example firewall (SG-2440) in `install_files/network_firewall/pfsense_full_backup.xml`. Note that this file has been edited by hand to remove potentially sensitive information (admin password hashes and the test server's TLS private key, among other things, were replaced with `REDACTED`), so you probably won't be able to import it directly (we haven't tried). The main sections of the file that you should be interested in are `interfaces`, `filter` (the firewall rules), and `aliases` (necessary to parse the firewall rules).
#### Example Screenshots
Here are some example screenshots of a working pfSense firewall configuration.
+##### 3 NICs Configuration
+
+##### 4 NICs Configuration
+
+
+
+
+
+
+
Once you've set up the firewall, **exit the Unsafe Browser**, and continue with the instructions in the [Install Guide](/docs/install.md#set-up-the-servers).
+
+
+### Keeping pfSense Up to Date
+
+Periodically, the pfSense project maintainers release an update to the pfSense software running on your firewall. You will be notified by the appearance of bold red text saying "Update available" in the **Version** section of the "Status: Dashboard" page (the home page of the WebGUI).
+
+
+
+If you see that an update is available, we recommend installing it. Most of these updates are for minor bugfixes, but occasionally they can contain important security fixes. If you are receiving support from Freedom of the Press Foundation, we will inform you when an important security update is available for your pfSense firewall. Alternatively, you can keep appraised of updates yourself by checking the ["releases" tag on the pfSense Blog](https://blog.pfsense.org/?tag=releases) (protip: use the RSS feed).
+
+To install the update, click the "click here" link next to "Update available". We recommend checking the "perform full backup prior to upgrade" box in case something goes wrong. Click "Invoke auto upgrade".
+
+
+
+You will see a blank page with a spinning progress indicator in the browser tab while pfSense performs the backup prior to upgrade. This typically takes a few minutes. Once that's done, you will see a page with a progress bar at the top that will periodically update as the upgrade progresses. Wait for the upgrade to complete, which may take a while depending on the speed of your network.
+
+*Note:* In a recent test, the progress page did not successfully update itself as the upgraded progressed. After waiting for some time, we refreshed the page and found that the upgrade had completed successfully. If your upgrade is taking longer than expected or not showing any progress, try refreshing the page.
diff --git a/install_files/ansible-base/group_vars/securedrop.yml b/install_files/ansible-base/group_vars/securedrop.yml
index f35a22db36..a77896719f 100644
--- 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:
diff --git a/install_files/network_firewall/pfsense_full_backup.xml b/install_files/network_firewall/pfsense_full_backup.xml
new file mode 100755
index 0000000000..8becb439bf
--- /dev/null
+++ b/install_files/network_firewall/pfsense_full_backup.xml
@@ -0,0 +1,781 @@
+<?xml version="1.0"?>
+<pfsense>
+ <version>11.9</version>
+ <lastchange/>
+ <theme>pfsense_ng</theme>
+ <system>
+ <optimization>normal</optimization>
+ <hostname>pfSense</hostname>
+ <domain>securedrop.local</domain>
+ <dnsserver>8.8.4.4</dnsserver>
+ <dnsserver>8.8.8.8</dnsserver>
+ <dnsallowoverride>on</dnsallowoverride>
+ <group>
+ <name>all</name>
+ <description><![CDATA[All Users]]></description>
+ <scope>system</scope>
+ <gid>1998</gid>
+ <member>0</member>
+ </group>
+ <group>
+ <name>admins</name>
+ <description><![CDATA[System Administrators]]></description>
+ <scope>system</scope>
+ <gid>1999</gid>
+ <member>0</member>
+ <priv>page-all</priv>
+ </group>
+ <user>
+ <name>admin</name>
+ <descr><![CDATA[System Administrator]]></descr>
+ <scope>system</scope>
+ <groupname>admins</groupname>
+ <password>REDACTED</password>
+ <uid>0</uid>
+ <priv>user-shell-access</priv>
+ <md5-hash>REDACTED</md5-hash>
+ <nt-hash>REDACTED</nt-hash>
+ </user>
+ <nextuid>2000</nextuid>
+ <nextgid>2000</nextgid>
+ <timezone>Etc/UTC</timezone>
+ <time-update-interval>300</time-update-interval>
+ <timeservers>0.pfsense.pool.ntp.org</timeservers>
+ <webgui>
+ <protocol>https</protocol>
+ <noautocomplete/>
+ <ssl-certref>55afb66613c71</ssl-certref>
+ </webgui>
+ <disablenatreflection>yes</disablenatreflection>
+ <disablesegmentationoffloading/>
+ <disablelargereceiveoffloading/>
+ <serialspeed>115200</serialspeed>
+ <enableserial/>
+ <ipv6allow/>
+ <powerd_enable/>
+ <powerd_ac_mode>hadp</powerd_ac_mode>
+ <powerd_battery_mode>hadp</powerd_battery_mode>
+ <powerd_normal_mode>hadp</powerd_normal_mode>
+ <bogons>
+ <interval>monthly</interval>
+ </bogons>
+ <kill_states/>
+ <crypto_hardware>aesni</crypto_hardware>
+ </system>
+ <interfaces>
+ <wan>
+ <enable/>
+ <if>igb0</if>
+ <ipaddr>dhcp</ipaddr>
+ <ipaddrv6>dhcp6</ipaddrv6>
+ <gateway/>
+ <blockpriv>on</blockpriv>
+ <blockbogons>on</blockbogons>
+ <media/>
+ <mediaopt/>
+ <dhcp6-duid/>
+ <dhcp6-ia-pd-len>0</dhcp6-ia-pd-len>
+ </wan>
+ <lan>
+ <enable/>
+ <if>igb1</if>
+ <ipaddr>10.20.1.1</ipaddr>
+ <subnet>24</subnet>
+ <media/>
+ <mediaopt/>
+ </lan>
+ <opt1>
+ <if>igb2</if>
+ <descr><![CDATA[OPT1]]></descr>
+ <enable/>
+ <spoofmac/>
+ <ipaddr>10.20.2.1</ipaddr>
+ <subnet>24</subnet>
+ </opt1>
+ <opt2>
+ <if>igb3</if>
+ <descr><![CDATA[OPT2]]></descr>
+ <enable/>
+ <spoofmac/>
+ <ipaddr>10.20.3.1</ipaddr>
+ <subnet>24</subnet>
+ </opt2>
+ </interfaces>
+ <staticroutes/>
+ <dhcpd/>
+ <pptpd>
+ <mode/>
+ <redir/>
+ <localip/>
+ <remoteip/>
+ </pptpd>
+ <snmpd>
+ <syslocation/>
+ <syscontact/>
+ <rocommunity>public</rocommunity>
+ </snmpd>
+ <diag>
+ <ipv6nat>
+ <ipaddr/>
+ </ipv6nat>
+ </diag>
+ <bridge/>
+ <syslog/>
+ <nat>
+ <outbound>
+ <mode>automatic</mode>
+ </outbound>
+ </nat>
+ <filter>
+ <rule>
+ <id/>
+ <tracker>1442384610</tracker>
+ <type>pass</type>
+ <interface>lan</interface>
+ <ipprotocol>inet</ipprotocol>
+ <tag/>
+ <tagged/>
+ <max/>
+ <max-src-nodes/>
+ <max-src-conn/>
+ <max-src-states/>
+ <statetimeout/>
+ <statetype>keep state</statetype>
+ <os/>
+ <protocol>tcp</protocol>
+ <source>
+ <address>admin_workstation</address>
+ </source>
+ <destination>
+ <address>local_servers</address>
+ </destination>
+ <descr><![CDATA[SSH access for initial installation (Ansible)]]></descr>
+ <updated>
+ <time>1442384610</time>
+ <username>[email protected]</username>
+ </updated>
+ <created>
+ <time>1442384610</time>
+ <username>[email protected]</username>
+ </created>
+ </rule>
+ <rule>
+ <id/>
+ <tracker>1442384638</tracker>
+ <type>pass</type>
+ <interface>lan</interface>
+ <ipprotocol>inet</ipprotocol>
+ <tag/>
+ <tagged/>
+ <max/>
+ <max-src-nodes/>
+ <max-src-conn/>
+ <max-src-states/>
+ <statetimeout/>
+ <statetype>keep state</statetype>
+ <os/>
+ <protocol>tcp</protocol>
+ <source>
+ <address>admin_workstation</address>
+ </source>
+ <destination>
+ <any/>
+ </destination>
+ <descr><![CDATA[Tails Tor connection]]></descr>
+ <updated>
+ <time>1442384638</time>
+ <username>[email protected]</username>
+ </updated>
+ <created>
+ <time>1442384638</time>
+ <username>[email protected]</username>
+ </created>
+ </rule>
+ <rule>
+ <id/>
+ <tracker>1442384949</tracker>
+ <type>pass</type>
+ <interface>opt1</interface>
+ <ipprotocol>inet</ipprotocol>
+ <tag/>
+ <tagged/>
+ <max/>
+ <max-src-nodes/>
+ <max-src-conn/>
+ <max-src-states/>
+ <statetimeout/>
+ <statetype>keep state</statetype>
+ <os/>
+ <protocol>udp</protocol>
+ <source>
+ <address>app_server</address>
+ </source>
+ <destination>
+ <address>monitor_server</address>
+ <port>OSSEC</port>
+ </destination>
+ <descr><![CDATA[OSSEC agent]]></descr>
+ <updated>
+ <time>1442384949</time>
+ <username>[email protected]</username>
+ </updated>
+ <created>
+ <time>1442384949</time>
+ <username>[email protected]</username>
+ </created>
+ </rule>
+ <rule>
+ <id/>
+ <tracker>1442385003</tracker>
+ <type>pass</type>
+ <interface>opt1</interface>
+ <ipprotocol>inet</ipprotocol>
+ <tag/>
+ <tagged/>
+ <max/>
+ <max-src-nodes/>
+ <max-src-conn/>
+ <max-src-states/>
+ <statetimeout/>
+ <statetype>keep state</statetype>
+ <os/>
+ <protocol>tcp</protocol>
+ <source>
+ <address>app_server</address>
+ </source>
+ <destination>
+ <address>monitor_server</address>
+ <port>ossec_agent_auth</port>
+ </destination>
+ <descr><![CDATA[Allow OSSEC agent auth during initial install]]></descr>
+ <updated>
+ <time>1442385003</time>
+ <username>[email protected]</username>
+ </updated>
+ <created>
+ <time>1442385003</time>
+ <username>[email protected]</username>
+ </created>
+ </rule>
+ <rule>
+ <id/>
+ <tracker>1442385070</tracker>
+ <type>block</type>
+ <interface>opt1</interface>
+ <ipprotocol>inet</ipprotocol>
+ <tag/>
+ <tagged/>
+ <max/>
+ <max-src-nodes/>
+ <max-src-conn/>
+ <max-src-states/>
+ <statetimeout/>
+ <statetype>keep state</statetype>
+ <os/>
+ <source>
+ <network>opt1</network>
+ </source>
+ <destination>
+ <network>lan</network>
+ </destination>
+ <descr><![CDATA[Block non-whitelisted traffic between OPT1 and LAN]]></descr>
+ <created>
+ <time>1442385070</time>
+ <username>[email protected]</username>
+ </created>
+ <updated>
+ <time>1442385087</time>
+ <username>[email protected]</username>
+ </updated>
+ </rule>
+ <rule>
+ <id/>
+ <tracker>1442385121</tracker>
+ <type>block</type>
+ <interface>opt1</interface>
+ <ipprotocol>inet</ipprotocol>
+ <tag/>
+ <tagged/>
+ <max/>
+ <max-src-nodes/>
+ <max-src-conn/>
+ <max-src-states/>
+ <statetimeout/>
+ <statetype>keep state</statetype>
+ <os/>
+ <source>
+ <network>opt1</network>
+ </source>
+ <destination>
+ <network>opt2</network>
+ </destination>
+ <descr><![CDATA[Block non-whitelisted traffic between OPT1 and OPT2]]></descr>
+ <updated>
+ <time>1442385121</time>
+ <username>[email protected]</username>
+ </updated>
+ <created>
+ <time>1442385121</time>
+ <username>[email protected]</username>
+ </created>
+ </rule>
+ <rule>
+ <id/>
+ <tracker>1442385165</tracker>
+ <type>pass</type>
+ <interface>opt1</interface>
+ <ipprotocol>inet</ipprotocol>
+ <tag/>
+ <tagged/>
+ <max/>
+ <max-src-nodes/>
+ <max-src-conn/>
+ <max-src-states/>
+ <statetimeout/>
+ <statetype>keep state</statetype>
+ <os/>
+ <protocol>tcp</protocol>
+ <source>
+ <address>app_server</address>
+ </source>
+ <destination>
+ <any/>
+ </destination>
+ <descr><![CDATA[Allow TCP out on any port for Tor]]></descr>
+ <updated>
+ <time>1442385165</time>
+ <username>[email protected]</username>
+ </updated>
+ <created>
+ <time>1442385165</time>
+ <username>[email protected]</username>
+ </created>
+ </rule>
+ <rule>
+ <id/>
+ <tracker>1442385233</tracker>
+ <type>pass</type>
+ <interface>opt1</interface>
+ <ipprotocol>inet</ipprotocol>
+ <tag/>
+ <tagged/>
+ <max/>
+ <max-src-nodes/>
+ <max-src-conn/>
+ <max-src-states/>
+ <statetimeout/>
+ <statetype>keep state</statetype>
+ <os/>
+ <protocol>tcp/udp</protocol>
+ <source>
+ <address>app_server</address>
+ </source>
+ <destination>
+ <address>external_dns_servers</address>
+ <port>53</port>
+ </destination>
+ <descr><![CDATA[Allow DNS]]></descr>
+ <updated>
+ <time>1442385233</time>
+ <username>[email protected]</username>
+ </updated>
+ <created>
+ <time>1442385233</time>
+ <username>[email protected]</username>
+ </created>
+ </rule>
+ <rule>
+ <id/>
+ <tracker>1442385357</tracker>
+ <type>pass</type>
+ <interface>opt1</interface>
+ <ipprotocol>inet</ipprotocol>
+ <tag/>
+ <tagged/>
+ <max/>
+ <max-src-nodes/>
+ <max-src-conn/>
+ <max-src-states/>
+ <statetimeout/>
+ <statetype>keep state</statetype>
+ <os/>
+ <protocol>udp</protocol>
+ <source>
+ <address>app_server</address>
+ </source>
+ <destination>
+ <any/>
+ <port>123</port>
+ </destination>
+ <descr><![CDATA[Allow NTP]]></descr>
+ <created>
+ <time>1442385357</time>
+ <username>[email protected]</username>
+ </created>
+ <updated>
+ <time>1442386386</time>
+ <username>[email protected]</username>
+ </updated>
+ </rule>
+ <rule>
+ <id/>
+ <tracker>1442385433</tracker>
+ <type>block</type>
+ <interface>opt2</interface>
+ <ipprotocol>inet</ipprotocol>
+ <tag/>
+ <tagged/>
+ <max/>
+ <max-src-nodes/>
+ <max-src-conn/>
+ <max-src-states/>
+ <statetimeout/>
+ <statetype>keep state</statetype>
+ <os/>
+ <source>
+ <network>opt2</network>
+ </source>
+ <destination>
+ <network>lan</network>
+ </destination>
+ <descr><![CDATA[Block all non-whitelisted traffic from OPT2 and LAN]]></descr>
+ <updated>
+ <time>1442385433</time>
+ <username>[email protected]</username>
+ </updated>
+ <created>
+ <time>1442385433</time>
+ <username>[email protected]</username>
+ </created>
+ </rule>
+ <rule>
+ <id/>
+ <tracker>1442385483</tracker>
+ <type>block</type>
+ <interface>opt2</interface>
+ <ipprotocol>inet</ipprotocol>
+ <tag/>
+ <tagged/>
+ <max/>
+ <max-src-nodes/>
+ <max-src-conn/>
+ <max-src-states/>
+ <statetimeout/>
+ <statetype>keep state</statetype>
+ <os/>
+ <source>
+ <network>opt2</network>
+ </source>
+ <destination>
+ <network>opt1</network>
+ </destination>
+ <descr><![CDATA[Block all non-whitelisted traffic from OPT2 and OPT1]]></descr>
+ <updated>
+ <time>1442385483</time>
+ <username>[email protected]</username>
+ </updated>
+ <created>
+ <time>1442385483</time>
+ <username>[email protected]</username>
+ </created>
+ </rule>
+ <rule>
+ <id/>
+ <tracker>1442385530</tracker>
+ <type>pass</type>
+ <interface>opt2</interface>
+ <ipprotocol>inet</ipprotocol>
+ <tag/>
+ <tagged/>
+ <max/>
+ <max-src-nodes/>
+ <max-src-conn/>
+ <max-src-states/>
+ <statetimeout/>
+ <statetype>keep state</statetype>
+ <os/>
+ <protocol>tcp</protocol>
+ <source>
+ <address>monitor_server</address>
+ </source>
+ <destination>
+ <any/>
+ </destination>
+ <descr><![CDATA[Allow TCP out on any port for Tor and SMTP]]></descr>
+ <updated>
+ <time>1442385530</time>
+ <username>[email protected]</username>
+ </updated>
+ <created>
+ <time>1442385530</time>
+ <username>[email protected]</username>
+ </created>
+ </rule>
+ <rule>
+ <id/>
+ <tracker>1442385574</tracker>
+ <type>pass</type>
+ <interface>opt2</interface>
+ <ipprotocol>inet</ipprotocol>
+ <tag/>
+ <tagged/>
+ <max/>
+ <max-src-nodes/>
+ <max-src-conn/>
+ <max-src-states/>
+ <statetimeout/>
+ <statetype>keep state</statetype>
+ <os/>
+ <protocol>tcp/udp</protocol>
+ <source>
+ <address>monitor_server</address>
+ </source>
+ <destination>
+ <address>external_dns_servers</address>
+ <port>53</port>
+ </destination>
+ <descr><![CDATA[Allow DNS]]></descr>
+ <updated>
+ <time>1442385574</time>
+ <username>[email protected]</username>
+ </updated>
+ <created>
+ <time>1442385574</time>
+ <username>[email protected]</username>
+ </created>
+ </rule>
+ <rule>
+ <id/>
+ <tracker>1442385619</tracker>
+ <type>pass</type>
+ <interface>opt2</interface>
+ <ipprotocol>inet</ipprotocol>
+ <tag/>
+ <tagged/>
+ <max/>
+ <max-src-nodes/>
+ <max-src-conn/>
+ <max-src-states/>
+ <statetimeout/>
+ <statetype>keep state</statetype>
+ <os></os>
+ <protocol>udp</protocol>
+ <source>
+ <address>monitor_server</address>
+ </source>
+ <destination>
+ <any/>
+ <port>123</port>
+ </destination>
+ <descr><![CDATA[Allow NTP]]></descr>
+ <created>
+ <time>1442385619</time>
+ <username>[email protected]</username>
+ </created>
+ <updated>
+ <time>1442386405</time>
+ <username>[email protected]</username>
+ </updated>
+ </rule>
+ </filter>
+ <shaper>
+ </shaper>
+ <ipsec>
+ <phase1/>
+ </ipsec>
+ <aliases>
+ <alias>
+ <name>admin_workstation</name>
+ <address>10.20.1.2</address>
+ <descr/>
+ <type>host</type>
+ <detail><![CDATA[Entry added Wed, 16 Sep 2015 06:19:38 +0000]]></detail>
+ </alias>
+ <alias>
+ <name>app_server</name>
+ <address>10.20.2.2</address>
+ <descr/>
+ <type>host</type>
+ <detail><![CDATA[Entry added Wed, 16 Sep 2015 06:19:55 +0000]]></detail>
+ </alias>
+ <alias>
+ <name>external_dns_servers</name>
+ <address>8.8.8.8 8.8.4.4</address>
+ <descr/>
+ <type>host</type>
+ <detail><![CDATA[Entry added Wed, 16 Sep 2015 06:20:33 +0000||Entry added Wed, 16 Sep 2015 06:20:33 +0000]]></detail>
+ </alias>
+ <alias>
+ <name>local_servers</name>
+ <address>app_server monitor_server</address>
+ <descr/>
+ <type>host</type>
+ <detail><![CDATA[Entry added Wed, 16 Sep 2015 06:21:09 +0000||Entry added Wed, 16 Sep 2015 06:21:09 +0000]]></detail>
+ </alias>
+ <alias>
+ <name>monitor_server</name>
+ <address>10.20.3.2</address>
+ <descr/>
+ <type>host</type>
+ <detail><![CDATA[Entry added Wed, 16 Sep 2015 06:21:25 +0000]]></detail>
+ </alias>
+ <alias>
+ <name>OSSEC</name>
+ <address>1514</address>
+ <descr/>
+ <type>port</type>
+ <detail><![CDATA[Entry added Wed, 16 Sep 2015 06:21:48 +0000]]></detail>
+ </alias>
+ <alias>
+ <name>ossec_agent_auth</name>
+ <address>1515</address>
+ <descr/>
+ <type>port</type>
+ <detail><![CDATA[Entry added Wed, 16 Sep 2015 06:22:01 +0000]]></detail>
+ </alias>
+ </aliases>
+ <proxyarp/>
+ <cron>
+ <item>
+ <minute>1,31</minute>
+ <hour>0-5</hour>
+ <mday>*</mday>
+ <month>*</month>
+ <wday>*</wday>
+ <who>root</who>
+ <command>/usr/bin/nice -n20 adjkerntz -a</command>
+ </item>
+ <item>
+ <minute>1</minute>
+ <hour>3</hour>
+ <mday>1</mday>
+ <month>*</month>
+ <wday>*</wday>
+ <who>root</who>
+ <command>/usr/bin/nice -n20 /etc/rc.update_bogons.sh</command>
+ </item>
+ <item>
+ <minute>*/60</minute>
+ <hour>*</hour>
+ <mday>*</mday>
+ <month>*</month>
+ <wday>*</wday>
+ <who>root</who>
+ <command>/usr/bin/nice -n20 /usr/local/sbin/expiretable -v -t 3600 sshlockout</command>
+ </item>
+ <item>
+ <minute>*/60</minute>
+ <hour>*</hour>
+ <mday>*</mday>
+ <month>*</month>
+ <wday>*</wday>
+ <who>root</who>
+ <command>/usr/bin/nice -n20 /usr/local/sbin/expiretable -v -t 3600 webConfiguratorlockout</command>
+ </item>
+ <item>
+ <minute>1</minute>
+ <hour>1</hour>
+ <mday>*</mday>
+ <month>*</month>
+ <wday>*</wday>
+ <who>root</who>
+ <command>/usr/bin/nice -n20 /etc/rc.dyndns.update</command>
+ </item>
+ <item>
+ <minute>*/60</minute>
+ <hour>*</hour>
+ <mday>*</mday>
+ <month>*</month>
+ <wday>*</wday>
+ <who>root</who>
+ <command>/usr/bin/nice -n20 /usr/local/sbin/expiretable -v -t 3600 virusprot</command>
+ </item>
+ <item>
+ <minute>30</minute>
+ <hour>12</hour>
+ <mday>*</mday>
+ <month>*</month>
+ <wday>*</wday>
+ <who>root</who>
+ <command>/usr/bin/nice -n20 /etc/rc.update_urltables</command>
+ </item>
+ </cron>
+ <wol/>
+ <rrd>
+ <enable/>
+ </rrd>
+ <load_balancer>
+ <monitor_type>
+ <name>ICMP</name>
+ <type>icmp</type>
+ <descr><![CDATA[ICMP]]></descr>
+ <options/>
+ </monitor_type>
+ <monitor_type>
+ <name>TCP</name>
+ <type>tcp</type>
+ <descr><![CDATA[Generic TCP]]></descr>
+ <options/>
+ </monitor_type>
+ <monitor_type>
+ <name>HTTP</name>
+ <type>http</type>
+ <descr><![CDATA[Generic HTTP]]></descr>
+ <options>
+ <path>/</path>
+ <host/>
+ <code>200</code>
+ </options>
+ </monitor_type>
+ <monitor_type>
+ <name>HTTPS</name>
+ <type>https</type>
+ <descr><![CDATA[Generic HTTPS]]></descr>
+ <options>
+ <path>/</path>
+ <host/>
+ <code>200</code>
+ </options>
+ </monitor_type>
+ <monitor_type>
+ <name>SMTP</name>
+ <type>send</type>
+ <descr><![CDATA[Generic SMTP]]></descr>
+ <options>
+ <send/>
+ <expect>220 *</expect>
+ </options>
+ </monitor_type>
+ </load_balancer>
+ <widgets>
+ <sequence>system_information-container:col1:show,captive_portal_status-container:col1:close,carp_status-container:col1:close,cpu_graphs-container:col1:close,gateways-container:col1:close,gmirror_status-container:col1:close,installed_packages-container:col1:close,interface_statistics-container:col1:close,interfaces-container:col2:show,ipsec-container:col2:close,load_balancer_status-container:col2:close,log-container:col2:close,picture-container:col2:close,rss-container:col2:close,services_status-container:col2:close,traffic_graphs-container:col2:close</sequence>
+ </widgets>
+ <openvpn/>
+ <dnshaper>
+ </dnshaper>
+ <unbound>
+ <enable/>
+ <dnssec/>
+ <active_interface/>
+ <outgoing_interface/>
+ <custom_options/>
+ <hideidentity/>
+ <hideversion/>
+ <dnssecstripped/>
+ </unbound>
+ <cert>
+ <refid>55afb66613c71</refid>
+ <descr><![CDATA[webConfigurator default (55afb66613c71)]]></descr>
+ <type>server</type>
+ <crt>REDACTED</crt>
+ <prv>REDACTED</prv>
+ </cert>
+ <revision>
+ <time>1442386405</time>
+ <description><![CDATA[[email protected]: /firewall_rules_edit.php made unknown change]]></description>
+ <username>[email protected]</username>
+ </revision>
+ <ppps/>
+ <gateways/>
+</pfsense>
+
diff --git a/install_files/network_firewall/rules b/install_files/network_firewall/rules
deleted file mode 100644
index e8fa881d30..0000000000
--- a/install_files/network_firewall/rules
+++ /dev/null
@@ -1,48 +0,0 @@
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-:LOGNDROP - [0:0]
-
-# SSH access for initial installation (Ansible)
--A OUTPUT -s ADMIN_IP -p tcp --dport 22 -m state --state NEW,ESTABLISHED,RELATED -j ACCEPT -m comment --comment "admin ssh traffic"
--A INPUT -d ADMIN_IP -p tcp --sport 22 -m state --state ESTABLISHED,RELATED -j ACCEPT -m comment --comment "admin ssh traffic"
-
-# OSSEC agent
--A OUTPUT -s APP_IP -d MONITOR_IP -p udp --dport 1514 -m state --state NEW,ESTABLISHED,RELATED -j ACCEPT -m comment --comment "OSSEC agent"
--A INPUT -s MONITOR_IP -d APP_IP -p udp --sport 1514 -m state --state ESTABLISHED,RELATED -j ACCEPT -m comment --comment "OSSEC agent"
-
-# Allow OSSEC agent auth during initial install
--A OUTPUT -s APP_IP -d MONITOR_IP -p tcp --dport 1515 -m state --state NEW,ESTABLISHED,RELATED -j ACCEPT -m comment --comment "OSSEC agent auth"
--A INPUT -s MONITOR_IP -d APP_IP -p tcp --sport 1515 -m state --state ESTABLISHED,RELATED -j ACCEPT -m comment --comment "OSSEC agent auth"
-
-# Block non-whitelisted traffic between LAN and OPT1
-# If using the networks from the install documentation
-# LAN_NET = 10.20.1.0/24
-# OPT1_NET = 10.20.2.0/24
--A OUTPUT -s LAN_NET -d OPT1_NET -j LOGNDROP -m comment --comment "Block non-whitelisted traffic"
--A INPUT -s OPT1_NET -d LAN_NET -j LOGNDROP -m comment --comment "Block non-whitelisted traffic"
-
-# allow tor outbound
--A OUTPUT -s ADMIN_WORKSTATION,APP_IP,MONITOR_IP -p tcp -m state --state NEW,ESTABLISHED,RELATED -j ACCEPT -m comment --comment "Allow Tor"
--A INPUT -d ADMIN_WORKSTATION,APP_IP,MONITOR_IP -p tcp -m state --state ESTBALISHED,RELATED -j ACCEPT -m comment --comment "Allow Tor"
-
-# allow DNS
--A OUTPUT -s APP_IP,MONITOR_IP -d EXTERNAL_DNS_SERVERS -p udp --dport 53 -m state --state NEW,ESTABLISHED,RELATED -j ACCEPT -m comment --comment "Allow DNS"
--A INPUT -s EXTERNAL_DNS_SERVERS -d APP_IP,MONITOR_IP -p udp --sport 53 -m state --state ESTABLISHED,RELATED -j ACCEPT -m comment ---comment "Allow DNS"
-
-# allow NTP
--A OUTPUT -s APP_IP,MONITOR_IP -p udp --sport 123 --dport 123 -m state --state NEW,ESTABLISHED,RELATED -j ACCEPT -m comment --comment "Allow NTP"
--A INPUT -d APP_IP,MONITOR_IP -p udp --sport 123 --dport 123 -m state --state ESTABLISHED,RELATED -j ACCEPT -m comment --comment "Allow NTP"
-
-# Drop and log all other traffic
--A INPUT -j LOGNDROP -m comment --comment "Drop all other incomming traffic"
--A OUTPUT -j LOGNDROP -m comment --comment "Drop all other outgoing traffic"
-
-# LOGNDROP everything else
-# The log prefixes were added to make these match the default OSSEC rules for iptables
--A LOGNDROP -p tcp -m limit --limit 5/min -j LOG --log-prefix "Denied_TCP "
--A LOGNDROP -p udp -m limit --limit 5/min -j LOG --log-prefix "Denied_UDP "
--A LOGNDROP -p icmp -m limit --limit 5/min -j LOG --log-prefix "Denied_ICMP "
--A LOGNDROP -j DROP
-COMMIT
diff --git a/install_files/securedrop-app-code/DEBIAN/control b/install_files/securedrop-app-code/DEBIAN/control
index 347fc410e3..aecabc72c4 100644
--- a/install_files/securedrop-app-code/DEBIAN/control
+++ b/install_files/securedrop-app-code/DEBIAN/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: SecureDrop Team <[email protected]>
Homepage: https://freedom.press/securedrop
Package: securedrop-app-code
-Version: 0.3.4
+Version: 0.3.5
Architecture: amd64
Depends: python-pip,apparmor-utils,gnupg2,haveged,python,python-pip,secure-delete,sqlite,apache2-mpm-worker,libapache2-mod-wsgi,libapache2-mod-xsendfile,redis-server,supervisor
Description: Packages the SecureDrop application code pip dependencies and apparmor profiles. This package will put the apparmor profiles in enforce mode. This package does use pip to install the pip wheelhouse
diff --git a/install_files/securedrop-app-code/usr/share/doc/securedrop-app-code/changelog.Debian b/install_files/securedrop-app-code/usr/share/doc/securedrop-app-code/changelog.Debian
index f1c2910b2b..12d51826b5 100644
--- a/install_files/securedrop-app-code/usr/share/doc/securedrop-app-code/changelog.Debian
+++ b/install_files/securedrop-app-code/usr/share/doc/securedrop-app-code/changelog.Debian
@@ -1,3 +1,14 @@
+securedrop-app-code (0.3.5) trusty; urgency=medium
+
+ * 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)
+
+ -- SecureDrop Team <[email protected]> Fri, 18 Sep 2015 21:28:41 +0000
+
securedrop-app-code (0.3.4) trusty; urgency=medium
* Fix ineffective SSH connection throttling (iSEC-15FTC-7, #1053)
diff --git a/install_files/securedrop-ossec-agent/DEBIAN/control b/install_files/securedrop-ossec-agent/DEBIAN/control
index 3ab20f307f..45becadfac 100644
--- a/install_files/securedrop-ossec-agent/DEBIAN/control
+++ b/install_files/securedrop-ossec-agent/DEBIAN/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: SecureDrop Team <[email protected]>
Homepage: https://freedom.press/securedrop
Package: securedrop-ossec-agent
-Version: 2.8.2+0.3.4
+Version: 2.8.2+0.3.5
Architecture: amd64
Depends: ossec-agent
Replaces: ossec-agent
diff --git a/install_files/securedrop-ossec-server/DEBIAN/control b/install_files/securedrop-ossec-server/DEBIAN/control
index 13a9cec93d..5f8c96d3ee 100644
--- a/install_files/securedrop-ossec-server/DEBIAN/control
+++ b/install_files/securedrop-ossec-server/DEBIAN/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: SecureDrop Team <[email protected]>
Homepage: https://freedom.press/securedrop
Package: securedrop-ossec-server
-Version: 2.8.2+0.3.4
+Version: 2.8.2+0.3.5
Architecture: amd64
Depends: ossec-server
Replaces: ossec-server
diff --git a/securedrop/version.py b/securedrop/version.py
index bfeb9e74ab..40ed83d946 100644
--- a/securedrop/version.py
+++ b/securedrop/version.py
@@ -1 +1 @@
-__version__ = '0.3.4'
+__version__ = '0.3.5'
|
cookiecutter__cookiecutter-1273 | PEP257 docstrings for file "./docs/__init__.py"
Cover `./docs/__init__.py` file with docstrings and follow [PEP257](https://www.python.org/dev/peps/pep-0257/). We use [pydocstyle](https://pypi.org/project/pydocstyle/) for validation.
Current validation log:
```
./docs/__init__.py:1 at module level:
D104: Missing docstring in public package
```
Subtask for #742
| [
{
"content": "",
"path": "docs/__init__.py"
}
]
| [
{
"content": "# -*- coding: utf-8 -*-\n\n\"\"\"Main package for docs.\"\"\"\n",
"path": "docs/__init__.py"
}
]
| diff --git a/docs/__init__.py b/docs/__init__.py
index e69de29bb..e7eaad7bd 100644
--- a/docs/__init__.py
+++ b/docs/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+"""Main package for docs."""
|
microsoft__Qcodes-4248 | Filename collision due to case-sensitivity in Keysight folder
When pulling the qcodes repository on Windows, there is a filename collision between the uppercase and lowercase Keysight folders.
The error message is as follows:
```bash
$ git clone https://github.com/QCoDeS/Qcodes.git
Cloning into 'Qcodes'...
remote: Enumerating objects: 1522, done.
remote: Counting objects: 100% (1522/1522), done.
remote: Compressing objects: 100% (655/655), done.
Receiving objects: 100% (112398/112398), 242.65 MiB | 2.58 MiB/s, done.
Resolving deltas: 100% (87395/87395), done.
warning: the following paths have collided (e.g. case-sensitive paths
on a case-insensitive filesystem) and only one from the same
colliding group is in the working tree:
'qcodes/instrument_drivers/Keysight/__init__.py'
'qcodes/instrument_drivers/keysight/__init__.py'
```
I propose we remove the lowercase keysight folder as it has now been deprecated for over 2 years.
### System
Windows/OSX and other OS's with case insensitive file systems.
| [
{
"content": "",
"path": "qcodes/instrument_drivers/Keysight/__init__.py"
}
]
| [
{
"content": "# Intentionally left blank\n",
"path": "qcodes/instrument_drivers/Keysight/__init__.py"
}
]
| diff --git a/qcodes/instrument_drivers/Keysight/__init__.py b/qcodes/instrument_drivers/Keysight/__init__.py
index e69de29bb2d..e484f8b84cd 100644
--- a/qcodes/instrument_drivers/Keysight/__init__.py
+++ b/qcodes/instrument_drivers/Keysight/__init__.py
@@ -0,0 +1 @@
+# Intentionally left blank
diff --git a/qcodes/instrument_drivers/keysight/Use Upper Case Keysightfolder b/qcodes/instrument_drivers/keysight/Use Upper Case Keysightfolder
deleted file mode 100644
index 99af1006b40..00000000000
--- a/qcodes/instrument_drivers/keysight/Use Upper Case Keysightfolder
+++ /dev/null
@@ -1,2 +0,0 @@
-In the repository there are two different Keysight folders: "Keysight" and "keysight". Under some operating systems they appear as one. If you should see two, use the upper case one. For more information go to:
-https://github.com/QCoDeS/Qcodes/pull/725
diff --git a/qcodes/instrument_drivers/keysight/__init__.py b/qcodes/instrument_drivers/keysight/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
|
kivy__python-for-android-2797 | Python exception when using colorlog due to incomplete IO implementation in sys.stderr
I am attempting to run a program which uses `TTYColoredFormatter` from [colorlog](https://pypi.org/project/colorlog/). This class formats log messages, adding ANSI escape codes _only_ if the stream it is writing to returns `True` for `stream.isatty()`.
Unfortunately, python-for-android's bootstrap code replaces sys.stderr and sys.stdout with a custom `LogFile` object: https://github.com/kivy/python-for-android/blob/53d77fc26c9e37eb6ce05f8899f4dae8334842b1/pythonforandroid/bootstraps/common/build/jni/application/src/start.c#L226-L242
This object doesn't implement `isatty()` (or much else, for that matter). As a result, the program raises an exception:
```
03-03 13:32:56.222 5806 5891 I python : Traceback (most recent call last):
03-03 13:32:56.222 5806 5891 I python : File "/home/jenkins/workspace/kolibri-installer-android-pr/src/main.py", line 3, in <module>
03-03 13:32:56.222 5806 5891 I python : File "/home/jenkins/workspace/kolibri-installer-android-pr/src/kolibri_android/main_activity/__main__.py", line 7, in main
03-03 13:32:56.222 5806 5891 I python : File "/home/jenkins/workspace/kolibri-installer-android-pr/src/kolibri_android/main_activity/activity.py", line 19, in <module>
03-03 13:32:56.222 5806 5891 I python : File "/home/jenkins/workspace/kolibri-installer-android-pr/src/kolibri_android/kolibri_utils.py", line 13, in <module>
03-03 13:32:56.223 5806 5891 I python : File "/home/jenkins/workspace/kolibri-installer-android-pr/src/kolibri_android/android_whitenoise.py", line 11, in <module>
03-03 13:32:56.223 5806 5891 I python : File "/home/jenkins/workspace/kolibri-installer-android-pr/src/kolibri/__init__.py", line 10, in <module>
03-03 13:32:56.223 5806 5891 I python : File "/home/jenkins/workspace/kolibri-installer-android-pr/src/kolibri/utils/env.py", line 29, in <module>
03-03 13:32:56.223 5806 5891 I python : File "/home/jenkins/workspace/kolibri-installer-android-pr/src/kolibri/dist/colorlog/colorlog.py", line 203, in __init__
03-03 13:32:56.223 5806 5891 I python : AttributeError: 'LogFile' object has no attribute 'isatty'
```
(For reference, we're using colorlog v3.2.0, so the code raising the exception looks like this: https://github.com/borntyping/python-colorlog/blob/v3.2.0/colorlog/colorlog.py#L191-L211).
Service don t start anymore, as smallIconName extra is now mandatory
https://github.com/kivy/python-for-android/blob/8cb497dd89e402478011df61f4690b963a0c96da/pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonService.java#L116
```java.lang.NullPointerException: Attempt to invoke virtual method 'boolean java.lang.String.equals(java.lang.Object)' on a null object reference```
We could test if null before.
| [
{
"content": "__version__ = '2023.02.10'\n",
"path": "pythonforandroid/__init__.py"
}
]
| [
{
"content": "__version__ = '2023.05.21'\n",
"path": "pythonforandroid/__init__.py"
}
]
| diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3724af62ab..98288f265d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,45 @@
# Changelog
+## [v2023.05.21](https://github.com/kivy/python-for-android/tree/v2023.05.21)
+
+[Full Changelog](https://github.com/kivy/python-for-android/compare/v2023.02.10...v2023.05.21)
+
+**Closed issues:**
+
+- python [\#2795](https://github.com/kivy/python-for-android/issues/2795)
+- Create APK from PyQt app [\#2794](https://github.com/kivy/python-for-android/issues/2794)
+- psutil/\_psutil\_linux.so" is 64-bit instead of 32-bit [\#2785](https://github.com/kivy/python-for-android/issues/2785)
+- pythonforandroid.toolchain.py: error: unrecognized arguments: --dir [\#2775](https://github.com/kivy/python-for-android/issues/2775)
+- App [\#2774](https://github.com/kivy/python-for-android/issues/2774)
+- org.kivy.android.PythonActivity$NewIntentListener is not visible from class loader java.lang.IllegalArgumentException [\#2770](https://github.com/kivy/python-for-android/issues/2770)
+- Service don t start anymore, as smallIconName extra is now mandatory [\#2768](https://github.com/kivy/python-for-android/issues/2768)
+- Start a background sticky service that auto-restart. [\#2767](https://github.com/kivy/python-for-android/issues/2767)
+- Fail installation [\#2764](https://github.com/kivy/python-for-android/issues/2764)
+- Python exception when using colorlog due to incomplete IO implementation in sys.stderr [\#2762](https://github.com/kivy/python-for-android/issues/2762)
+- AttributeError: 'org.kivy.android.PythonService' object has no attribute 'getComponentName' [\#2760](https://github.com/kivy/python-for-android/issues/2760)
+- https://code.videolan.org not available [\#2758](https://github.com/kivy/python-for-android/issues/2758)
+- Cannot install Python-for-Android [\#2754](https://github.com/kivy/python-for-android/issues/2754)
+- c/\_cffi\_backend.c:407:23: error: expression is not assignable [\#2753](https://github.com/kivy/python-for-android/issues/2753)
+- not install [\#2749](https://github.com/kivy/python-for-android/issues/2749)
+- APK crashes upon launch. logcat error: null pointer dereference \(occurs with imported modules\) [\#2358](https://github.com/kivy/python-for-android/issues/2358)
+- Error occured while building the aplication using buildozer [\#2104](https://github.com/kivy/python-for-android/issues/2104)
+- "Could Not Extract Public Data" Needs very explicit instructions or feedback to the user [\#260](https://github.com/kivy/python-for-android/issues/260)
+
+**Merged pull requests:**
+
+- Update Kivy recipe for 2.2.0 [\#2793](https://github.com/kivy/python-for-android/pull/2793) ([misl6](https://github.com/misl6))
+- Update `pyjnius` version to `1.5.0` [\#2791](https://github.com/kivy/python-for-android/pull/2791) ([misl6](https://github.com/misl6))
+- fix tools/liblink: syntax error [\#2771](https://github.com/kivy/python-for-android/pull/2771) ([SomberNight](https://github.com/SomberNight))
+- fix \#2768 smallIconName null can t be compared to String [\#2769](https://github.com/kivy/python-for-android/pull/2769) ([brvier](https://github.com/brvier))
+- android\_api to integer [\#2765](https://github.com/kivy/python-for-android/pull/2765) ([kuzeyron](https://github.com/kuzeyron))
+- Use io.IOBase for LogFile [\#2763](https://github.com/kivy/python-for-android/pull/2763) ([dylanmccall](https://github.com/dylanmccall))
+- Home app functionality [\#2761](https://github.com/kivy/python-for-android/pull/2761) ([kuzeyron](https://github.com/kuzeyron))
+- Add debug loggings for identifying a matching dist [\#2751](https://github.com/kivy/python-for-android/pull/2751) ([BitcoinWukong](https://github.com/BitcoinWukong))
+- Add PyAV recipe [\#2750](https://github.com/kivy/python-for-android/pull/2750) ([DexerBR](https://github.com/DexerBR))
+- Merge master into develop [\#2748](https://github.com/kivy/python-for-android/pull/2748) ([misl6](https://github.com/misl6))
+- Add support for Python 3.10 and make it the default while building hostpython3 and python3 [\#2577](https://github.com/kivy/python-for-android/pull/2577) ([misl6](https://github.com/misl6))
+
+
## [v2023.02.10](https://github.com/kivy/python-for-android/tree/v2023.02.10) (2023-02-10)
[Full Changelog](https://github.com/kivy/python-for-android/compare/v2023.01.28...v2023.02.10)
diff --git a/pythonforandroid/__init__.py b/pythonforandroid/__init__.py
index 3e337f8ce6..ec30da5902 100644
--- a/pythonforandroid/__init__.py
+++ b/pythonforandroid/__init__.py
@@ -1 +1 @@
-__version__ = '2023.02.10'
+__version__ = '2023.05.21'
|
OCHA-DAP__hdx-ckan-1038 | Update the version number on the logo and footer.
For sprint 25, we will increment to 0.3.2
| [
{
"content": "hdx_version='v0.3.1'",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| [
{
"content": "hdx_version='v0.3.2'",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/version.py b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
index 13e6c49927..a1e294d081 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/version.py
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
@@ -1 +1 @@
-hdx_version='v0.3.1'
\ No newline at end of file
+hdx_version='v0.3.2'
\ No newline at end of file
|
OCHA-DAP__hdx-ckan-770 | remove text from home page
Please remove this text from homepage 'This is an early version of the HDX Repository. Initially, you will be able to find global datasets relevant to humanitarian work as well as local datasets from our three pilot locations - Colombia, Kenya and Yemen. You can also create an account and add your own data to the repository to share privately or publicly. Please have a look around and send us your feedback!' this will be covered in the about page. Not sure if yumi will want to adjusts the centering of the remaining HDX and tagline but we can ask her
| [
{
"content": "hdx_version='v0.2.6'",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| [
{
"content": "hdx_version='v0.3.0'",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/public/hdx_theme.css b/ckanext-hdx_theme/ckanext/hdx_theme/public/hdx_theme.css
index 3561f27e3b..428a547358 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/public/hdx_theme.css
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/public/hdx_theme.css
@@ -1014,6 +1014,7 @@ for example: in the user dashboard when the user has no organizations */
width: inherit;
top: 30%;
margin-left: -220px;
+ color: #000;
}
.hdx-modal .controls {
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/home/index.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/home/index.html
index 614dfe6757..898be4ad97 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/home/index.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/home/index.html
@@ -25,17 +25,19 @@
<div class="row">
<div class="span6">
<h1>
- {{ _("The humanitarian data exchange") }}
+ {{ _("The Humanitarian Data Exchange") }}
</h1>
<h3>
{{ _("Where your data comes to life") }}
</h3>
<p class="hdxDescription">
+ {#
{{ _("This is an early version of the HDX Repository. Initially, you will be able to find
global datasets relevant to humanitarian work as well as local datasets from our
three pilot locations - Colombia, Kenya and Yemen. You can also create an
account and add your own data to the repository to share privately or publicly.
Please have a look around and send us your feedback!") }}
+ #}
</p>
</div>
</div>
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/bulk_process.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/bulk_process.html
index dd2af199de..f63a9abea2 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/bulk_process.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/bulk_process.html
@@ -89,7 +89,7 @@ <h3 class="dataset-heading">
</table>
</form>
{% else %}
- <p class="empty">{{ _('This organization has no datasets associated to it') }}</p>
+ <p class="empty">{{ _('This organisation has no datasets associated to it') }}</p>
{% endif %}
{% endblock %}
</div>
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/edit.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/edit.html
index 33a27be764..741c239956 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/edit.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/edit.html
@@ -1,9 +1,9 @@
{% extends "organization/base_form_page.html" %}
-{% block subtitle %}{{ _('Edit Organization') }}{% endblock %}
+{% block subtitle %}{{ _('Edit Organisation') }}{% endblock %}
{% block page_heading_class %}hide-heading{% endblock %}
-{% block page_heading %}{{ _('Edit Organization') }}{% endblock %}
+{% block page_heading %}{{ _('Edit Organisation') }}{% endblock %}
{% block primary %}
<div class="create-org">
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/edit_base.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/edit_base.html
index 37811c9ba1..5ba305c8ce 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/edit_base.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/edit_base.html
@@ -5,7 +5,7 @@
{% block subtitle %}{{ organization.display_name }}{% endblock %}
{% block breadcrumb_content %}
- <li>{% link_for _('Organizations'), controller='organization', action='index' %}</li>
+ <li>{% link_for _('Organisations'), controller='organization', action='index' %}</li>
{% block breadcrumb_content_inner %}
<li>{% link_for organization.display_name|truncate(35), controller='organization', action='read', id=organization.name %}</li>
<li class="active">{% link_for _('Admin'), controller='organization', action='edit', id=organization.name %}</li>
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/index.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/index.html
index cb4a57ac36..21c1ad42a2 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/index.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/index.html
@@ -1,9 +1,9 @@
{% extends "page.html" %}
-{% block subtitle %}{{ _('Organizations') }}{% endblock %}
+{% block subtitle %}{{ _('Organisations') }}{% endblock %}
{% block breadcrumb_content %}
- <li class="active">{% link_for _('Organizations'), controller='organization', action='index' %}</li>
+ <li class="active">{% link_for _('Organisations'), controller='organization', action='index' %}</li>
{% endblock %}
{% block page_header %}{% endblock %}
@@ -11,9 +11,9 @@
{% block page_primary_action %}
{% if h.check_access('organization_create') %}
{% if c.userobj.sysadmin %}
- {% link_for _('Add Organization'), controller='organization', action='new', class_='btn btn-primary', icon='plus-sign-alt' %}
+ {% link_for _('Add Organisation'), controller='organization', action='new', class_='btn btn-primary', icon='plus-sign-alt' %}
{% else %}
- <a href="/organization/request_new?from=organization" class="btn btn-primary">{{ _("Request New Organization")}}</a>
+ <a href="/organization/request_new?from=organization" class="btn btn-primary">{{ _("Request New Organisation")}}</a>
{% endif %}
@@ -21,17 +21,17 @@
{% endblock %}
{% block primary_content_inner %}
- <h1 class="hide-heading">{% block page_heading %}{{ _('Organizations') }}{% endblock %}</h1>
+ <h1 class="hide-heading">{% block page_heading %}{{ _('Organisations') }}{% endblock %}</h1>
{% block organizations_search_form %}
{% set sorting_option = c.sort_by_selected or 'name asc' %}
- {% snippet 'snippets/search_form.html', type='organization', query=c.q, sorting_selected=sorting_option, count=c.page.item_count, placeholder=_('Search organizations...'), show_empty=request.params %}
+ {% snippet 'snippets/search_form.html', type='organization', query=c.q, sorting_selected=sorting_option, count=c.page.item_count, placeholder=_('Search organisations...'), show_empty=request.params %}
{% endblock %}
{% block organizations_list %}
{% if c.page.items or request.params %}
{% snippet "organization/snippets/organization_list.html", organizations=c.page.items %}
{% else %}
<p class="empty">
- {{ _('There are currently no organizations for this site') }}.
+ {{ _('There are currently no organisations for this site') }}.
{% if h.check_access('organization_create') %}
{% link_for _('How about creating one?'), controller='organization', action='new' %}</a>.
{% endif %}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/members.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/members.html
index 0300d80838..3f9b269396 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/members.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/members.html
@@ -4,7 +4,7 @@
{% set authorized = h.check_access('organization_update', {'id': c.group_dict.id}) %}
{% block breadcrumb_content %}
- <li>{% link_for _('Organizations'), controller='organization', action='index' %}</li>
+ <li>{% link_for _('Organisations'), controller='organization', action='index' %}</li>
<li>{% link_for c.group_dict.display_name|truncate(35), controller='organization', action='read', id=c.group_dict.name %}</li>
<li class="active">{% link_for _('Members'), controller='organization', action='members', id=c.group_dict.name %}</li>
{% endblock %}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/new.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/new.html
index 84c79919cc..5a039bc014 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/new.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/new.html
@@ -1,25 +1,25 @@
{% extends "organization/base_form_page.html" %}
-{% block subtitle %}{{ _('Create an Organization') }}{% endblock %}
+{% block subtitle %}{{ _('Create an Organisation') }}{% endblock %}
{% block breadcrumb_link %}
- {{ h.nav_link(_('Create an Organization'), controller='organization', action='edit', id=c.organization.name) }}
+ {{ h.nav_link(_('Create an Organisation'), controller='organization', action='edit', id=c.organization.name) }}
{% endblock %}
-{# block page_heading %}{{ _('Create an Organization') }}{% endblock #}
+{# block page_heading %}{{ _('Create an Organisation') }}{% endblock #}
{# block page_header %}{% endblock #}
{% block breadcrumb_content %}
{% block breadcrumb_content_inner %}
- <li class="active">{% link_for _('Add Organization'), controller='organization', action='new'%}</li>
+ <li class="active">{% link_for _('Add Organisation'), controller='organization', action='new'%}</li>
{% endblock %}
{% endblock %}
{% block toolbar %}
{{ super() }}
- {% snippet "snippets/greeting_message.html", show_small_message=True, greeting=_('Creating an organization is easy.'),
- explanation=_('Organizations don\'t have to be legal entities - they can be informal groups that users create to share data publicily or privately.') %}
+ {% snippet "snippets/greeting_message.html", show_small_message=True, greeting=_('Creating an organisation is easy.'),
+ explanation=_('Organisations don\'t have to be legal entities - they can be informal groups that users create to share data publicily or privately.') %}
{% endblock %}
{% block primary %}
@@ -38,7 +38,7 @@
<h1 class="h1-title uppercase">
{% block page_heading %}1. {{ _('Basic Details') }}{% endblock %}
</h1>
- <p>{{ _('Tell us some basic details about your organization.') }}</p>
+ <p>{{ _('Tell us some basic details about your organisation.') }}</p>
{% block form %}
{{ c.form | safe }}
{% endblock %}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/new_organization_form.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/new_organization_form.html
index 2abefc2231..9711955049 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/new_organization_form.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/new_organization_form.html
@@ -16,7 +16,7 @@
{% block save_text %}
{%- if action == "edit" -%}
- {{ _('Update Organization') }}
+ {{ _('Update Organisation') }}
{%- else -%}
{{ _('Submit') }}
{%- endif -%}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/organization_preselector.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/organization_preselector.html
index 80a32151cc..9b876c7016 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/organization_preselector.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/organization_preselector.html
@@ -8,13 +8,13 @@
{{ super() }}
{% set find_org_url = h.url_for(controller='organization', action='index') %}
{% set create_org_url = h.url_for(controller='organization', action='new') if c.am_sysadmin
- else h.url_for(controller='organization', action='index') %}
+ else h.url_for(controller='ckanext.hdx_theme.org_controller:HDXReqsOrgController', action='request_new_organization') %}
{% snippet "snippets/greeting_message.html", show_small_message=True, greeting=_('Thanks for contributing - you rock.'),
- explanation=_('First, please select the organization you will be contributing for. If you are not currently a member
- of the organization you\'d like to contribute to,
- <a href="'+find_org_url+'">find and request membership to the organization</a>
+ explanation=_('First, please select the organisation you will be contributing for. If you are not currently a member
+ of the organisation you\'d like to contribute to,
+ <a href="'+find_org_url+'">find and request membership to the organisation</a>
or
- <a href="'+create_org_url+'">add a new organization</a>.') %}
+ <a href="'+create_org_url+'">add a new organisation</a>.') %}
{% endblock %}
{% block primary %}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/read.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/read.html
index da45b3f495..e1361a1ac3 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/read.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/read.html
@@ -61,7 +61,7 @@
{% else %}
<div class="big-message">
<p>
- {{ _('There are no datasets currently uploaded to this organization.') }}
+ {{ _('There are no datasets currently uploaded to this organisation.') }}
</p>
<p>
{% if h.check_access('package_create', {'organization_id': c.group_dict.id}) %}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/read_base.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/read_base.html
index becb31029d..6ee2d7b9dd 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/read_base.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/read_base.html
@@ -3,7 +3,7 @@
{% block subtitle %}{{ c.group_dict.display_name }}{% endblock %}
{% block breadcrumb_content %}
- <li>{% link_for _('Organizations'), controller='organization', action='index' %}</li>
+ <li>{% link_for _('Organisations'), controller='organization', action='index' %}</li>
<li>{% link_for c.group_dict.display_name|truncate(35), controller='organization', action='read', id=c.group_dict.name %}</li>
{% endblock %}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/request_mem_or_org.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/request_mem_or_org.html
index a115aa1faf..eb8244ceda 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/request_mem_or_org.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/request_mem_or_org.html
@@ -3,7 +3,7 @@
<div>
{% block primary_content %}
-{% snippet "snippets/greeting_message.html", show_small_message=True, greeting=_('Thanks for contributing - you rock.'), explanation=_('You don\'t currently belong to any organizations. You need to belong to an organization before you can contribute a dataset. Please choose an option below:') %}
+{% snippet "snippets/greeting_message.html", show_small_message=True, greeting=_('Thanks for contributing - you rock.'), explanation=_('You don\'t currently belong to any organisations. You need to belong to an organisation before you can contribute a dataset. Please choose an option below:') %}
{% snippet "organization/snippets/mem_or_org.html", parent_route='dataset_preselect' %}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/request_new.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/request_new.html
index 2a13cd9215..5ec7a95bb8 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/request_new.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/request_new.html
@@ -1,10 +1,10 @@
{% extends "organization/new.html" %}
{% block toolbar %}
- {% snippet "snippets/greeting_message.html", show_small_message=True, greeting=_('Create new organization'),
+ {% snippet "snippets/greeting_message.html", show_small_message=True, greeting=_('Create new organisation'),
explanation=_('We try to get the highest quality data in our system so we review
- new organization requests before they are posted on the site. Once you fill out a request form
- we try and accept the new organization request within 24h.') %}
+ new organisation requests before they are posted on the site. Once you fill out a request form
+ we try and accept the new organisation request within 24h.') %}
{% endblock %}
{% block primary_content_inner %}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/request_organization_form.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/request_organization_form.html
index 4614b32301..355f37700e 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/request_organization_form.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/request_organization_form.html
@@ -16,7 +16,7 @@
<h1 class="h1-title uppercase">
{% block page_heading %}1. {{ _('Basic Details') }}{% endblock %}
</h1>
- <p>{{ _('Tell us some basic details about your organization.') }}</p>
+ <p>{{ _('Tell us some basic details about your organisation.') }}</p>
{{ super() }}
</div>
</div>
@@ -50,7 +50,7 @@ <h1 class="h1-title uppercase">
{{ form.input('your_email', label=_('Your Email'), id='your-email', type='email', placeholder=_('[email protected]'),
value=data.your_email, error=errors.your_email, classes=['control-full','org-control','field-with-info', 'mandatory']) }}
<div class="org-control-info info-field">
- <div class="org-info-label">{{_('This email should be related to the organization.')}}</div>
+ <div class="org-info-label">{{_('This email should be related to the organisation.')}}</div>
</div>
</div>
</div>
@@ -63,7 +63,7 @@ <h1 class="h1-title uppercase">
<div class="offset1 span9">
<div class="create-org form-actions">
<button class="btn btn-primary create-org-btn" name="save" type="submit">
- {% block save_text %}{{ _('Request New Organization') }}{% endblock %}
+ {% block save_text %}{{ _('Request New Organisation') }}{% endblock %}
</button>
</div>
</div>
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/mem_or_org.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/mem_or_org.html
index e988796512..e54a38c2ca 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/mem_or_org.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/mem_or_org.html
@@ -1,15 +1,15 @@
{# {% snippet "organization/snippets/mem_or_org.html", parent_route='user_dashboard_organizations' %} #}
{% set parent_route = parent_route if parent_route else 'user_dashboard_organizations' %}
<div class="row row-fluid">
- <div class="span6 lined"><div class="header-user-message header-user-message-med">1. {{ _("REQUEST MEMBERSHIP IN AN ORGANIZATION")}}</div>
- <p>{{ _("There's a good chance that your organization is already a part of our database. You can find your organization and request membership. Once the admin has accepted your request, you should be able to upload datasets. Note that you have to be either an editor or admin role in order to upload datasets, so make sure to request one of those roles.")}}</p>
+ <div class="span6 lined"><div class="header-user-message header-user-message-med">1. {{ _("REQUEST MEMBERSHIP IN AN ORGANISATION")}}</div>
+ <p>{{ _("There's a good chance that your organisation is already a part of our database. You can find your organisation and request membership. Once the admin has accepted your request, you should be able to upload datasets. Note that you have to be either an editor or admin role in order to upload datasets, so make sure to request one of those roles.")}}</p>
<br>
- <center><a href="/organization" class="btn">{{ _("Find Your Organization")}}</a></center>
+ <center><a href="/organisation" class="btn">{{ _("Find Your Organisation")}}</a></center>
</div>
- <div class="span6 lined"><div class="header-user-message header-user-message-med">2. {{ _("CREATE A NEW ORGANIZATION")}}</div>
-<p>{{ _("If you don't see your organization in our organizations list, you can request the creation of a new organization. We try to get the highest quality data in our system, so we review new org requests before they are posted to the site. Once you fill out a request form, however, we try and accept the new org request within 24 hours.")}}</p>
+ <div class="span6 lined"><div class="header-user-message header-user-message-med">2. {{ _("CREATE A NEW ORGANISATION")}}</div>
+<p>{{ _("If you don't see your organisation in our organisations list, you can request the creation of a new organisation. We try to get the highest quality data in our system, so we review new org requests before they are posted to the site. Once you fill out a request form, however, we try and accept the new org request within 24 hours.")}}</p>
<br>
- <center><a href="/organization/request_new?from={{ parent_route }}" class="btn">{{ _("Request New Organization")}}</a></center>
+ <center><a href="/organization/request_new?from={{ parent_route }}" class="btn">{{ _("Request New Organisation")}}</a></center>
</div>
</div>
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/member_item.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/member_item.html
index ec0cd85c06..06a8ccf121 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/member_item.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/member_item.html
@@ -20,7 +20,7 @@ <h3 class="list-items dataset-heading">
<div class="list-items counter">
<span class="count"> {{ h.hdx_show_singular_plural(member.ds_num, _('Dataset'), _('Datasets')) }}</span>
-
- <span class="count"> {{ h.hdx_show_singular_plural(member.org_num, _('Organization'), _('Organizations')) }}</span>
+ <span class="count"> {{ h.hdx_show_singular_plural(member.org_num, _('Organisation'), _('Organisations')) }}</span>
-
<span class="count"> {{ h.hdx_show_singular_plural(member.grp_num, _('Countries'), _('Countries')) }}</span>
</div>
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/organization_form.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/organization_form.html
index 56b4a987f4..5c36615c10 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/organization_form.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/organization_form.html
@@ -8,7 +8,7 @@
{% block basic_fields %}
{% set attrs = {'data-module': 'slug-preview-target', 'type':'hidden'} %}
<div class="org-control-container">
- {{ form.input('title', label=_('Name of Organization'), id='field-title', value=data.title, error=errors.title, classes=['control-full', 'org-control', 'mandatory', 'field-with-info'], attrs=attrs) }}
+ {{ form.input('title', label=_('Name of Organisation'), id='field-title', value=data.title, error=errors.title, classes=['control-full', 'org-control', 'mandatory', 'field-with-info'], attrs=attrs) }}
{# Perhaps these should be moved into the controller? #}
{% set prefix = h.url_for(controller='organization', action='read', id='') %}
@@ -19,19 +19,19 @@
<div class="org-info-label">{{_('Be as specific as possible (i.e. don\'t just say WFP, say WFP-Colombia)')}}</div>
</div>
</div>
- {{ form.prepend('name', label=_('URL'), prepend=prefix, id='field-url', placeholder=_('my-organization'), value=data.name, error=errors.name, attrs=attrs) }}
+ {{ form.prepend('name', label=_('URL'), prepend=prefix, id='field-url', placeholder=_('my-organisation'), value=data.name, error=errors.name, attrs=attrs) }}
<div class="org-control-container">
- {{ form.input('org_url', label=_('URL of Organization'), id='field-image-url', type='url', placeholder=_('http://example.com/about'), value=data.image_url, error=errors.image_url, classes=['control-full','org-control','field-with-info']) }}
+ {{ form.input('org_url', label=_('URL of Organisation'), id='field-image-url', type='url', placeholder=_('http://example.com/about'), value=data.image_url, error=errors.image_url, classes=['control-full','org-control','field-with-info']) }}
<div class="org-control-info info-field">
- <div class="org-info-label">{{_('Where can people go to find more about this organization?')}}</div>
+ <div class="org-info-label">{{_('Where can people go to find more about this organisation?')}}</div>
</div>
</div>
<div class="org-control-container">
- {{ form.textarea('description', label=_('Description of Organization'), id='field-description', value=data.description, error=errors.description, classes=['org-control', 'mandatory','field-with-info']) }}
+ {{ form.textarea('description', label=_('Description of Organisation'), id='field-description', value=data.description, error=errors.description, classes=['org-control', 'mandatory','field-with-info']) }}
<div class="org-control-info-large info-field">
<div class="org-info-label-large">
- {{_('Brief overview of what organization is for.')}}</div>
+ {{_('Brief overview of what organisation is for.')}}</div>
</div>
</div>
@@ -88,8 +88,8 @@
{% block action_buttons %}
<div class="create-org form-actions">
{% block delete_button %}
- {% if h.check_access('organization_delete', {'id': data.id}) %}
- {% set locale = h.dump_json({'content': _('Are you sure you want to delete this Organization? This will delete all the public and private datasets belonging to this organization.')}) %}
+ {% if h.check_access('organisation_delete', {'id': data.id}) %}
+ {% set locale = h.dump_json({'content': _('Are you sure you want to delete this Organisation? This will delete all the public and private datasets belonging to this organisation.')}) %}
<a class="btn btn-danger pull-left" href="{% url_for controller='organization', action='delete', id=data.id %}" data-module="confirm-action" data-module-i18n="{{ locale }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
{% endif %}
{% endblock %}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/organization_preselector_item.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/organization_preselector_item.html
index d29ea56b9a..0110ef3d44 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/organization_preselector_item.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/organization_preselector_item.html
@@ -25,7 +25,7 @@
<div>
{% if not has_add_dataset_rights %}
- {% set confirm_delete_message = _('Looks like you\'re not an editor or an admin of this organization, so you can\'t add a dataset. Click the button below to send a request to the admin to make you an editor and close this box.') %}
+ {% set confirm_delete_message = _('Looks like you\'re not an editor or an admin of this organisation, so you can\'t add a dataset. Click the button below to send a request to the admin to make you an editor and close this box.') %}
{% snippet 'snippets/confirmation_post.html',
form_url=h.url_for('request_editing_rights',org_id=name, from='dataset_preselect'),
header = _('Oops!'), confirm_btn_label = _('Send a request to the admin'),
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/req_membership.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/req_membership.html
index a13a0be548..468fd59922 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/req_membership.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/req_membership.html
@@ -11,11 +11,11 @@
<div id="{{ modal_div_id }}" class="modal hide hdx-modal" tabindex="-1" role="dialog" aria-labelledby="{{ modal_div_id }}-label" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
- <h3 id="{{ modal_div_id }}-label">{{ _('Add Member') }}</h3>
+ <h3 id="{{ modal_div_id }}-label">{{ _('Request Membership') }}</h3>
</div>
<div class="modal-body">
{% set format_attrs = {'style':'width: 350px;'} %}
- {{ form.input('message', label=_('Message'), placeholder=_('Please add me to this organization'), value=user, classes=['control-medium'], attrs=format_attrs) }}
+ {{ form.textarea('message', label=_('Message'), placeholder=_('Please add me to this organisation'), value=user, classes=['control-medium'], attrs=format_attrs) }}
</div>
<div class="modal-footer">
<button class="btn hdx-btn hdx-submit-btn">{{ _('Submit') }}</button>
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/read_base.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/read_base.html
index e249646ba5..b34d637e76 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/read_base.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/read_base.html
@@ -22,8 +22,8 @@
{% block content_primary_nav %}
{% set num_of_new_related_items = h.hdx_num_of_new_related_items() %}
- {#% set num_of_new_related_items_msg = '({num} '.format(num=num_of_new_related_items) + _('New') + '!)' %#}
- {% set num_of_new_related_items_msg = '({num}'.format(num=num_of_new_related_items) + ')' %}
+ {% set num_of_new_related_items_msg = '({num} '.format(num=num_of_new_related_items) + _('New') + '!)' %}
+ {#% set num_of_new_related_items_msg = '({num}'.format(num=num_of_new_related_items) + ')' %#}
{{ h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name, class_='hdx-tab-button') }}
{{ h.build_nav_icon('dataset_activity', _('Activity Stream'), id=pkg.name, class_='hdx-tab-button') }}
{{ h.hdx_build_nav_icon_with_message('related_list', _('Related'), id=pkg.name, class_='hdx-tab-button',
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/version.py b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
index cd3b74a13b..f4a724cd76 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/version.py
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
@@ -1 +1 @@
-hdx_version='v0.2.6'
\ No newline at end of file
+hdx_version='v0.3.0'
\ No newline at end of file
diff --git a/ckanext-metadata_fields/ckanext/metadata_fields/templates/package/package_onepage.html b/ckanext-metadata_fields/ckanext/metadata_fields/templates/package/package_onepage.html
index 8ff910210f..dce3f145bd 100644
--- a/ckanext-metadata_fields/ckanext/metadata_fields/templates/package/package_onepage.html
+++ b/ckanext-metadata_fields/ckanext/metadata_fields/templates/package/package_onepage.html
@@ -61,7 +61,7 @@
iconAnchor: [15,35]
});
- L.tileLayer('https://{s}.tiles.mapbox.com/v3/reliefweb.wrl_hdx/{z}/{x}/{y}.png', {
+ L.tileLayer('https://{s}.tiles.mapbox.com/v3/reliefweb.im6jg6a0/{z}/{x}/{y}.png', {
attribution: '<a href="http://www.mapbox.com/about/maps/" target="_blank">Terms & Feedback</a>',
maxZoom: 5
}).addTo(map);
|
OCHA-DAP__hdx-ckan-1082 | Update version number
Sprint 26 will be 0.3.3
| [
{
"content": "hdx_version='v0.3.2'",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| [
{
"content": "hdx_version='v0.3.3'",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/version.py b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
index a1e294d081..a55927af9a 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/version.py
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
@@ -1 +1 @@
-hdx_version='v0.3.2'
\ No newline at end of file
+hdx_version='v0.3.3'
\ No newline at end of file
|
OCHA-DAP__hdx-ckan-1737 | Shrink the map and related divs
| [
{
"content": "hdx_version = 'v0.4.8'\n",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| [
{
"content": "hdx_version = 'v0.4.9'\n",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/crisis-page.js b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/crisis-page.js
index 46f21c5eda..0a2fa32894 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/crisis-page.js
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/crisis-page.js
@@ -1,8 +1,7 @@
$(document).ready(function() {
map = L.map('ebola-map', null, { zoomControl:false });
- L.tileLayer('http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png', {
- attribution: '<a class="mR45" href="http://www.mapbox.com/about/maps/" target="_blank">Terms & Feedback</a>',
+ L.tileLayer($('#crisis-map-url-div').text(), {
maxZoom: 10
}).addTo(map);
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/crisis-page.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/crisis-page.css
index b02a3ea5cc..bdfdfcd8ce 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/crisis-page.css
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/crisis-page.css
@@ -1,12 +1,12 @@
#ebola-map {
- height: 450px;
+ height: 350px;
}
.ebola-map-title {
- height:100px;
+ height:50px;
background-color: rgba(255, 255, 255, 0.4);
position: absolute;
- top: 350px;
+ top: 300px;
width: 100%;
}
@@ -25,7 +25,6 @@
font-size: 16px;
letter-spacing: 0.01em;
margin-bottom: 40px;
- text-transform: capitalize;
}
.item-info .item-info-number {
@@ -62,12 +61,18 @@
font-weight: bold;
font-size: 28px;
letter-spacing: 0.01em;
- line-height: 100px;
+ line-height: 50px;
text-transform: capitalize;
}
/* Dataset search results on crisis page */
.crisis-list-header.list-header {
background-color: inherit;
}
+/* END - Dataset search results on crisis page */
-/* END - Dataset search results on crisis page */
\ No newline at end of file
+/* Position Leaflet copyright div on top right*/
+.leaflet-control-attribution.leaflet-control{
+ position: relative;
+ top: -335px;
+ left: 4px;
+}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css
index ba0f58fbeb..6f934f8e30 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css
@@ -541,6 +541,9 @@
.mTop35{
margin-top: 35px;
}
+ .mTop25{
+ margin-top: 25px;
+ }
.mTop20{
margin-top: 20px;
}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/crisis/crisis.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/crisis/crisis.html
index 57badd24fa..f6dddc1af6 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/crisis/crisis.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/crisis/crisis.html
@@ -10,11 +10,12 @@
{% block primary_content %}
<div class="row paddingRowHack" style="position: relative;">
+ <div id="crisis-map-url-div" style="display: none;">{{ h.hdx_get_ckan_config('hdx.crisismap.url') }}</div>
<div id="ebola-map">
</div>
<div class="ebola-map-title">
<span class="mL45 crisisTitle"> West Africa: Ebola outbreak </span>
- <span class="mR45 pull-right" style="color: black; line-height: 80px; font-weight: bold; font-size: 30px;">
+ <span class="mR45 pull-right" style="line-height: 50px;">
<a class="btn hdx-btn org-btn" data-module-placement="left" data-module="bs_popover" data-module-social_div_id="dataset_social"
data-module-social_wrapper_div_id="dataset_social_wrapper" title="Share page">Share</a>
<div id="dataset_social_wrapper" class="popover-wrapper"></div>
@@ -47,7 +48,7 @@
</span>
</div>
</div>
- <div class="row mTop70">
+ <div class="row mTop25">
{% block top_line_figures %}
{% for item in c.top_line_items %}
<div class="col-xs-4">
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/version.py b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
index 4bfd2bf505..e388f91cf8 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/version.py
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
@@ -1 +1 @@
-hdx_version = 'v0.4.8'
+hdx_version = 'v0.4.9'
diff --git a/common-config-ini.txt b/common-config-ini.txt
index 905886f17f..cff76f529e 100644
--- a/common-config-ini.txt
+++ b/common-config-ini.txt
@@ -154,6 +154,7 @@ hdx.cache.onstartup = true
hdx.homepage.extrasources = 13
hdx.datapreview.url = //data.hdx.rwlabs.org/dataproxy
hdx.previewmap.url = http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png
+hdx.crisismap.url = http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png
hdx.rest.indicator.endpoint = https://manage.hdx.rwlabs.org/hdx/public/api2/values
hdx.rest.indicator.endpoint.facets = https://manage.hdx.rwlabs.org/hdx/public/api2
|
OCHA-DAP__hdx-ckan-1779 | Ebola Page>Map: disable scroll wheel zoom
CJ - The specific property is here: https://github.com/OCHA-DAP/hdx-design/blob/gh-pages/js/country.js
line 111: map.scrollWheelZoom.disable();
| [
{
"content": "hdx_version = 'v0.5.1'\n",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| [
{
"content": "hdx_version = 'v0.5.2'\n",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/crisis_page/crisis-page.js b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/crisis_page/crisis-page.js
index 561fb9369a..908fe8a3f0 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/crisis_page/crisis-page.js
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/crisis_page/crisis-page.js
@@ -1,6 +1,6 @@
$(document).ready(function() {
map = L.map('ebola-map', { attributionControl: false });
-
+ map.scrollWheelZoom.disable();
L.tileLayer($('#crisis-map-url-div').text(), {
attribution: ' © <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors',
maxZoom: 10
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/version.py b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
index 262e989c5c..f5970bc825 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/version.py
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
@@ -1 +1 @@
-hdx_version = 'v0.5.1'
+hdx_version = 'v0.5.2'
|
OCHA-DAP__hdx-ckan-2135 | Browse Page Map: opening a country link has different behaviors
From the map: open in new tab
From the list: open in same tab
We should make it the same: open in same tab (unless there was some specification that it should be a new tab that I'm not remembering.
Graphic in Colombia page: instead of line (time-series) make it a bar graph.
CJ added current action for this issue:
- Change "Number of IDPs" graph **from** bar graph **to** line graph.
-----------------Original issue text follows---------------------
I think the graph **Number of people with access constrains** would look better if it was a bar graph instead of a line, time-series:
The reason I think that is that the lines give the impression the indicator changes significantly every month, but in a continuum of time. Bar graphs will help the user compare months as nearly independent measurements, which is influences better consumption of the data in my opinion.
I chatted with the Data Team about this (including @JavierTeran) and they've approved this suggestion.
| [
{
"content": "hdx_version = 'v0.6.1'\n",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| [
{
"content": "hdx_version = 'v0.6.2'\n",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/browse/browse.js b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/browse/browse.js
index f911871a34..db2258503f 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/browse/browse.js
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/browse/browse.js
@@ -56,7 +56,7 @@ function prepareMap(){
var closeTooltip, country, countryLayer, country_id, feature, featureClicked, first_letter, getStyle, highlightFeature, k, line, map, mapID, onEachFeature, openURL, popup, resetFeature, topLayer, topPane, v, _i, _j, _len, _len1, _ref;
//mapID = 'yumiendo.ijchbik8';
openURL = function(url) {
- return window.open(url, '_blank').focus();
+ return window.open(url, '_self').focus();
};
closeTooltip = window.setTimeout(function() {
return map.closePopup();
@@ -173,7 +173,7 @@ function prepareCount() {
for (var i in data){
var item = data[i];
- var code = item.id.toUpperCase();
+ var code = item.name.toUpperCase();
var newItem = {};
newItem.title = item.title;
newItem.dataset_count = item.dataset_count;
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/crisis-colombia/crisis-colombia.js b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/crisis-colombia/crisis-colombia.js
index 14d0597867..ba02a59c05 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/crisis-colombia/crisis-colombia.js
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/crisis-colombia/crisis-colombia.js
@@ -103,7 +103,7 @@ function drawGraph2() {
names: {
"Persons": "Number of People with Access Constraints"
},
- type: 'area'
+ type: 'bar'
},
legend:{
show: false
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/public/homepage.css b/ckanext-hdx_theme/ckanext/hdx_theme/public/homepage.css
index f8593346cf..8b3dd06b2d 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/public/homepage.css
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/public/homepage.css
@@ -37,7 +37,7 @@
background-position: center;
font-family: 'Gotham-Bold',sans-serif;
font-weight: 400;
- overflow: hidden;
+ /*overflow: hidden;*/
/*min-width: 1380px;*/
}
@@ -194,13 +194,20 @@
margin-left: 34px;
}
- .homepage-main .rightContent .countRow .span2{
- margin: 0;
- }
+ /* Ugly split for count items*/
- .homepage-main .rightContent .countRow .span2:first-child{
- margin-right: 30px;
- }
+ .homepage-main .rightContent .countRow .span6{
+ width: 510px;
+ }
+
+ .homepage-main .rightContent .countRow .span2{
+ margin: 0;
+ }
+
+ .homepage-main .rightContent .countRow .span2:first-child{
+ margin-right: 30px;
+ }
+ /**/
.homepageHeaderFooterBackground{
background-color: #ffffff;
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/version.py b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
index b3bfb54a64..5f7bc490cf 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/version.py
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
@@ -1 +1 @@
-hdx_version = 'v0.6.1'
+hdx_version = 'v0.6.2'
|
OCHA-DAP__hdx-ckan-1748 | Shrink the spacing on the top line numbers
Proposed spacings shown here:
modified css:
.item-info {
border-top: 1px solid #cccccc;
border-bottom: 1px solid #cccccc;
padding: 20px 0;
margin-top: -1px;
color: #333333;
}
.item-info .item-info-title {
font-family: 'Gotham-Bold', sans-serif;
font-weight: 400;
font-size: 16px;
letter-spacing: 0.01em;
margin-bottom: 20px;
}
.item-info .item-info-number {
font-family: 'Gotham-Light', sans-serif;
font-size: 74px;
line-height: 1;
letter-spacing: 0.01em;
margin-bottom: 20px;
}
| [
{
"content": "hdx_version = 'v0.4.9'\n",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| [
{
"content": "hdx_version = 'v0.4.10'\n",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/crisis-page.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/crisis-page.css
index 7f4c17f9df..dcc221eba9 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/crisis-page.css
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/crisis-page.css
@@ -14,7 +14,7 @@
.item-info {
border-top: 1px solid #cccccc;
border-bottom: 1px solid #cccccc;
- padding: 40px 0;
+ padding: 20px 0;
margin-top: -1px;
color: #333333;
}
@@ -24,7 +24,7 @@
font-weight: 400;
font-size: 16px;
letter-spacing: 0.01em;
- margin-bottom: 40px;
+ margin-bottom: 20px;
}
.item-info .item-info-number {
@@ -32,7 +32,7 @@
font-size: 74px;
line-height: 1;
letter-spacing: 0.01em;
- margin-bottom: 34px;
+ margin-bottom: 20px;
}
.item-info .item-info-number span.small {
@@ -40,7 +40,7 @@
font-size: 37px;
line-height: 1;
letter-spacing: 0.01em;
- margin-bottom: 34px;
+ margin-bottom: 20px;
margin-left: -15px;
}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/version.py b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
index e388f91cf8..945394e5ab 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/version.py
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
@@ -1 +1 @@
-hdx_version = 'v0.4.9'
+hdx_version = 'v0.4.10'
|
OCHA-DAP__hdx-ckan-1401 | The MailChimp subscribe field could use a little bit more padding-left
Right now the input text is too close to the left border. It would be nice to add some padding there.
| [
{
"content": "hdx_version = 'v0.3.9'\n",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| [
{
"content": "hdx_version = 'v0.3.10'\n",
"path": "ckanext-hdx_theme/ckanext/hdx_theme/version.py"
}
]
| diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/public/mailchimp.js b/ckanext-hdx_theme/ckanext/hdx_theme/public/mailchimp.js
index 2375baeb2d..e6e0374755 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/public/mailchimp.js
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/public/mailchimp.js
@@ -44,7 +44,7 @@ function mce_init_form(){
var options = { errorClass: 'mce_inline_error', errorElement: 'div', onkeyup: function(){}, onfocusout:function(){}, onblur:function(){} };
var mce_validator = $("#mc-embedded-subscribe-form").validate(options);
$("#mc-embedded-subscribe-form").unbind('submit');//remove the validator so we can get into beforeSubmit on the ajaxform, which then calls the validator
- options = { url: 'http://unocha.us2.list-manage.com/subscribe/post-json?u=83487eb1105d72ff2427e4bd7&id=6fd988326c&c=?', type: 'GET', dataType: 'json', contentType: "application/json; charset=utf-8",
+ options = { url: '//unocha.us2.list-manage.com/subscribe/post-json?u=83487eb1105d72ff2427e4bd7&id=6fd988326c&c=?', type: 'GET', dataType: 'json', contentType: "application/json; charset=utf-8",
beforeSubmit: function(){
$('#mce_tmp_error_msg').remove();
$('.datefield','#mc_embed_signup').each(
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/footer.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/footer.html
index e38ca6d0f1..94ed084990 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/footer.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/footer.html
@@ -31,7 +31,7 @@
<form action="//unocha.us2.list-manage.com/subscribe/post?u=83487eb1105d72ff2427e4bd7&id=6fd988326c" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate="" _lpchecked="1">
<div class="six columns left" style="padding-left: 0px;">
- <input style="width: 340px; margin: 0; padding: 0;" type="email" value="" name="EMAIL" class="required email" id="mce-EMAIL">
+ <input style="width: 340px; margin: 0; padding: 5;" type="email" value="" name="EMAIL" class="required email" id="mce-EMAIL">
<input style="height: 44px; margin-left: 20px;" type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="btn btn-primary">
</div>
<div id="mce-responses" class="clear">
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/version.py b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
index e560071d6a..33b7a48515 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/version.py
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
@@ -1 +1 @@
-hdx_version = 'v0.3.9'
+hdx_version = 'v0.3.10'
|
End of preview. Expand
in Data Studio
# removed all repos of SWE-bench and RepoBench
repos = [
"astropy",
"django",
"flask",
"matplotlib",
"seaborn",
"requests",
"xarray",
"pylint",
"pytest",
"scikit-learn",
"sphinx",
"sympy",
]
- Downloads last month
- 90