Add back necessary env var, remove more unnecessary ones

.env.template

@@ -1,29 +1,17 @@
 HUNDRED_EYES_PROJECT_NAME=100eyes
 POSTGRES_PASSWORD=
 POSTGRES_USER=
-TELEGRAM_BOT_API_KEY=TOKEN
-TELEGRAM_BOT_USERNAME=NameOfYourBot
 
 SIGNAL_SERVER_PHONE_NUMBER="+4987654321"
 
 EMAIL_FROM_ADDRESS=test@example.org
 
-THREEMARB_API_IDENTITY=
-THREEMARB_API_SECRET=
-THREEMARB_PRIVATE=
-
-TWILIO_ACCOUNT_SID=
-TWILIO_API_KEY_SID=
-TWILIO_API_KEY_SECRET=
-WHATS_APP_SERVER_PHONE_NUMBER=
-
 # These environment variables are optional during
 # development, but required when running 100eyes
 # in a production environment.
 #
 # SECRET_KEY_BASE=
 # APPLICATION_HOSTNAME=
-# RAILS_INBOUND_EMAIL_PASSWORD=
 # POSTMARK_API_TOKEN=
 # POSTMARK_BROADCASTS_STREAM=broadcasts
 # POSTMARK_TRANSACTIONAL_STREAM=outbound

.env.test.local

@@ -1,30 +1,19 @@
 HUNDRED_EYES_PROJECT_NAME=100eyes
 POSTGRES_PASSWORD=
 POSTGRES_USER=postgres
-TELEGRAM_BOT_API_KEY=TOKEN
-TELEGRAM_BOT_USERNAME=NameOfYourBot
 
 SIGNAL_SERVER_PHONE_NUMBER='+4912345678'
 
 EMAIL_FROM_ADDRESS=test@example.org
 
-THREEMARB_API_IDENTITY=
-THREEMARB_API_SECRET=
-THREEMARB_PRIVATE=
-
-TWILIO_ACCOUNT_SID='valid_account_sid'
 TWILIO_AUTH_TOKEN='valid_auth_token'
-TWILIO_API_KEY_SID='valid_api_key_sid'
-TWILIO_API_KEY_SECRET='valid_api_key_secret'
-WHATS_APP_SERVER_PHONE_NUMBER='+4912345678'
 
 # These environment variables are optional during
 # development, but required when running 100eyes
 # in a production environment.
 #
 # SECRET_KEY_BASE=
 APPLICATION_HOSTNAME=example.org
-# RAILS_INBOUND_EMAIL_PASSWORD=
 POSTMARK_API_TOKEN=valid_token
 POSTMARK_BROADCASTS_STREAM=broadcasts
 POSTMARK_TRANSACTIONAL_STREAM=outbound

ansible/generate_config.sh

@@ -64,18 +64,11 @@ rails:
     password: # (REQUIRED) copied from Digital Ocean database config
     host: # optional (e.g. for managed databases)
     port: # optional (e.g. for managed databases)
-  inbound_email_password: "${inbound_email_password}"
   email_from_address: "redaktion@${domain}"
   sentry:
     dsn: # (REQUIRED) Sentry DSN to enable error tracking
-  whats_app:
-    server_phone_number: ""
   twilio:
-    account_sid: ""
     auth_token: ""
-    api_key:
-      sid: ""
-      secret: ""
   three_sixty_dialog:
     partner:
       id: ""

ansible/roles/installation/tasks/main.yml

@@ -39,12 +39,12 @@
     POSTMARK_TRANSACTIONAL_STREAM: "{{ rails.postmark.transactional_stream }}"
     EMAIL_FROM_ADDRESS: "{{ rails.email_from_address }}"
     SECRET_KEY_BASE: "{{ rails.secret_key_base }}"
-    RAILS_INBOUND_EMAIL_PASSWORD: "{{ rails.inbound_email_password }}"
     CF_DNS_API_TOKEN: "{{ traefik.cloudflare_dns_api_token }}"
     SIGNAL_SERVER_PHONE_NUMBER: "{{ rails.signal.server_phone_number | default('') }}"
     SIGNAL_MONITORING_URL: "{{ rails.signal.monitoring_url | default('') }}"
     SENTRY_DSN: "{{ rails.sentry.dsn }}"
     ONBOARDING_SHOW_GDPR_MODAL: "{{ rails.onboarding.show_gdpr_modal | default('') | string | lower }}"
+    TWILIO_AUTH_TOKEN: "{{ rails.twilio.auth_token | default('') }}"
     THREE_SIXTY_DIALOG_PARTNER_ID: "{{ rails.three_sixty_dialog.partner.id | default('') }}"
     THREE_SIXTY_DIALOG_PARTNER_USERNAME: "{{ rails.three_sixty_dialog.partner.username | default('') }}"
     THREE_SIXTY_DIALOG_PARTNER_PASSWORD: "{{ rails.three_sixty_dialog.partner.password | default('') }}"

docker-compose.prod.yml

@@ -4,7 +4,6 @@ x-prod-defaults: &x-prod-defaults
     NODE_ENV: "production"
     RAILS_ENV: "${RAILS_ENV}"
     RAILS_SERVE_STATIC_FILES: "true"
-    RAILS_INBOUND_EMAIL_PASSWORD: "${RAILS_INBOUND_EMAIL_PASSWORD}"
     SECRET_KEY_BASE: "${SECRET_KEY_BASE}"
     POSTMARK_API_TOKEN: "${POSTMARK_API_TOKEN}"
     POSTMARK_BROADCASTS_STREAM: "${POSTMARK_BROADCASTS_STREAM}"
@@ -19,6 +18,7 @@ x-prod-defaults: &x-prod-defaults
     SIGNAL_MONITORING_URL: "${SIGNAL_MONITORING_URL}"
     SENTRY_DSN: "${SENTRY_DSN}"
     ONBOARDING_SHOW_GDPR_MODAL: "${ONBOARDING_SHOW_GDPR_MODAL}"
+    TWILIO_AUTH_TOKEN: "${TWILIO_AUTH_TOKEN}"
     THREE_SIXTY_DIALOG_PARTNER_ID: "${THREE_SIXTY_DIALOG_PARTNER_ID}"
     THREE_SIXTY_DIALOG_PARTNER_USERNAME: "${THREE_SIXTY_DIALOG_PARTNER_USERNAME}"
     THREE_SIXTY_DIALOG_PARTNER_PASSWORD: "${THREE_SIXTY_DIALOG_PARTNER_PASSWORD}"