Skip to content

Commit 4001d5f

Browse files
Merge pull request #275 from CodeForPhilly/develop
Release: v3.2.10
2 parents d0629b8 + 975ba02 commit 4001d5f

File tree

6 files changed

+13
-27
lines changed

6 files changed

+13
-27
lines changed

.env.example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
RECAPTCHA_SITE_KEY=
2+
RECAPTCHA_SECRET_KEY=

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.emergence
22
.php_cs.cache
3+
.env

.holo/sources/skeleton-v2.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[holosource]
22
url = "https://github.com/JarvusInnovations/emergence-skeleton-v2"
3-
ref = "refs/tags/v2.12.9"
3+
ref = "refs/tags/v2.12.10"

event-handlers/Emergence/People/RegistrationRequestHandler/beforeRegister/recaptcha.php

Lines changed: 0 additions & 9 deletions
This file was deleted.

php-config/ContactRequestHandler.config.d/recaptcha.php

Lines changed: 0 additions & 17 deletions
This file was deleted.

script/studio

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ if [ -n "${1}" ]; then
2222
fi
2323

2424

25+
# initialize .env
26+
if [ ! -f .env ]; then
27+
echo
28+
echo "==> studio: initializing .env"
29+
cp .env.example .env
30+
fi
31+
32+
2533
echo
2634
echo "==> studio: configuring Chef Habitat studio Docker options…"
2735
STUDIO_NAME="${STUDIO_NAME:-laddr-studio}"
@@ -33,6 +41,7 @@ export HAB_DOCKER_OPTS="
3341
-v $(cd ~/.ssh; pwd)/known_hosts:/root/.ssh/known_hosts:ro
3442
--env STUDIO_DEVELOPER_UID=$(id -u)
3543
--env STUDIO_DEVELOPER_GID=$(id -g)
44+
--env-file .env
3645
"
3746
echo "${HAB_DOCKER_OPTS}"
3847

0 commit comments

Comments
 (0)