freedomofpress / securethenews

An automated scanner and web dashboard for tracking TLS deployment across news organizations
https://securethe.news
GNU Affero General Public License v3.0
100 stars 25 forks source link

Rebase and merge k8s config branch #197

Closed conorsch closed 5 years ago

conorsch commented 5 years ago

Now that the master branch includes Wagtail 2 (#191), we can pull in a few additional backend customizations intended to add capability with a k8s-hosted containerized application.

Historical work is in the https://github.com/freedomofpress/securethenews/tree/K8S_MergeTime branch. Due to churn on master, that work needs to be rebased—current WIP for rebasing is in https://github.com/freedomofpress/securethenews/tree/K8S_MergeTime-rebased.

The drift is currently blocking active work in at least two (2) PRs:

Let's get a PR up resolving the conflicts, and test on a sandbox deploy to verify behavior. Once initial testing is sound, we can merge into master, and resume work on #195 & #196 after rebasing.