Disable by default

repman-io · Sep 16, 2020 · 00475ba · 00475ba
1 parent d04f638
commit 00475ba
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/.env b/.env
@@ -80,6 +80,7 @@ SECURITY_ADVISORIES_DB_DIR=%kernel.project_dir%/var/security-advisories
 ###< storage ###
 
 ###> excelwebzone/recaptcha-bundle ###
-EWZ_RECAPTCHA_SITE_KEY=changeme
-EWZ_RECAPTCHA_SECRET=changeme
+EWZ_RECAPTCHA_ENABLED=false
+EWZ_RECAPTCHA_SITE_KEY=
+EWZ_RECAPTCHA_SECRET=
 ###< excelwebzone/recaptcha-bundle ###
diff --git a/.env.docker b/.env.docker
@@ -83,3 +83,8 @@ PACKAGES_DIST_DIR=%kernel.project_dir%/var/repo
 SECURITY_ADVISORIES_DB_DIR=%kernel.project_dir%/var/security-advisories
 ###< storage ###
 
+###> excelwebzone/recaptcha-bundle ###
+EWZ_RECAPTCHA_ENABLED=false
+EWZ_RECAPTCHA_SITE_KEY=
+EWZ_RECAPTCHA_SECRET=
+###< excelwebzone/recaptcha-bundle ###
diff --git a/ansible/roles/app.deploy/templates/.env.local b/ansible/roles/app.deploy/templates/.env.local
@@ -25,5 +25,9 @@ TRUSTED_PROXIES={{ lookup('env', 'REPMAN_TRUSTED_PROXIES') or '' }}
 
 GA_TRACKING={{ lookup('env', 'REPMAN_GA_TRACKING') or '' }}
 
+EWZ_RECAPTCHA_ENABLED={{ lookup('env', 'REPMAN_EWZ_RECAPTCHA_ENABLED') or 'false' }}
+EWZ_RECAPTCHA_SITE_KEY={{ lookup('env', 'REPMAN_EWZ_RECAPTCHA_SITE_KEY') or '' }}
+EWZ_RECAPTCHA_SECRET={{ lookup('env', 'REPMAN_EWZ_RECAPTCHA_SECRET') or '' }}
+
 PROXY_DIST_DIR={{ lookup('env', 'REPMAN_PROXY_DIST_DIR') or '%kernel.project_dir%/var/proxy' }}
 PACKAGES_DIST_DIR={{ lookup('env', 'REPMAN_PACKAGES_DIST_DIR') or '%kernel.project_dir%/var/repo' }}
diff --git a/config/packages/dev/ewz_recaptcha.yaml b/config/packages/dev/ewz_recaptcha.yaml
diff --git a/config/packages/ewz_recaptcha.yaml b/config/packages/ewz_recaptcha.yaml
@@ -1,3 +1,4 @@
 ewz_recaptcha:
+    enabled: '%env(bool:EWZ_RECAPTCHA_ENABLED)%'
     public_key:  '%env(EWZ_RECAPTCHA_SITE_KEY)%'
     private_key: '%env(EWZ_RECAPTCHA_SECRET)%'