WIP more takahe

* Add s3 auth
* Send error emails

diff --git a/personal_infra/playbooks/roles/takahe/tasks/main.yaml b/personal_infra/playbooks/roles/takahe/tasks/main.yaml
index 44ad0c403d9ad45aa97cd05c92f248cffc3712b3..ce3767eafbff970249f605c39d925815b7613741 100644 (file)
--- a/personal_infra/playbooks/roles/takahe/tasks/main.yaml
+++ b/personal_infra/playbooks/roles/takahe/tasks/main.yaml
@@ -16,6 +16,7 @@
       data:
         TAKAHE_SECRET_KEY: "{{ takahe.secret_key | b64encode }}"
         TAKAHE_EMAIL_SERVER: "{{ ('smtp://' + mail.ses_username + ':' + mail.ses_password + '@' + mail.ses_endpoint + ':25?tls=true') | b64encode }}"
+        TAKAHE_MEDIA_BACKEND: "{{ (takahe.s3_proto + '://' + takahe.s3_access_key + ':' + takahe.s3_secret_key + '@' + takahe.s3_endpoint + '/' + takahe.s3_bucket) | b64encode }}"
   delegate_to: 127.0.0.1
 - k8s:
     context: "{{ context }}"
@@ -29,12 +30,12 @@
         PGHOST: "{{ takahe.database_host }}"
         PGUSER: "{{ takahe.database_user }}"
         PGDATABASE: "{{ takahe.database }}"
-        TAKAHE_MEDIA_BACKEND: "{{ takahe.s3 }}"
         TAKAHE_MAIN_DOMAIN: "{{ takahe.main_domain }}"
         TAKAHE_EMAIL_FROM: "{{ takahe.email_from }}"
         TAKAHE_USE_PROXY_HEADERS: "true"
         TAKAHE_AUTO_ADMIN_EMAIL: "{{ takahe.admin_email }}"
         TAKAHE_CSRF_HOSTS: "{{ ['https://' + takahe.main_domain] | to_json }}"
+        TAKAHE_ERROR_EMAILS: "{{ [takahe.admin_email] | to_json }}"
   delegate_to: 127.0.0.1
 - k8s:
     context: "{{ context }}"

diff --git a/personal_infra/puppet/site/h1.pdp7.net.pp b/personal_infra/puppet/site/h1.pdp7.net.pp
index c9bab2d3fa396d579c07f5cab2421e6746e69a5b..5198976d374767ed3d99ab321624ea318cfb2ad7 100644 (file)
--- a/personal_infra/puppet/site/h1.pdp7.net.pp
+++ b/personal_infra/puppet/site/h1.pdp7.net.pp
@@ -76,6 +76,10 @@ node 'h1.pdp7.net' {
     target => 'http://k8s-test.h1.int.pdp7.net/',
   }
 
+  proxmox::proxy_host {'takahe-media.pdp7.net':
+    target => 'http://weed.h1.int.pdp7.net:8333/',
+  }
+
   package {'haproxy':}
   ->
   file {'/etc/haproxy/haproxy.cfg':