diff --git a/.env b/.env index 618ff24..0550a1a 100644 --- a/.env +++ b/.env @@ -34,4 +34,15 @@ BOT_SERVICE_TOKEN=xoxb-791472305859-913372508932-2CcYhaCRrTLDXzKc5Df9ZMUb BOT_SERVICE_CHANNEL=CPLTQQQ0Y MONGO_USERNAME=in_sylva_mongoc -MONGO_PASSWORD=v2kGBDUaGjXK2VuPyf5R64VS \ No newline at end of file +MONGO_PASSWORD=v2kGBDUaGjXK2VuPyf5R64VS + +# Attention, you can generate reCAPTCHA_SECRET_KEY by following this link https://www.google.com/u/3/recaptcha/admin/site/ with In-Sylva gmail account that is named insylva2020@gmail.com +IN_SYLVA_reCAPTCHA_SECRET_KEY=6LflFcoZAAAAAIRAgPSrwhsKQJ8TZjE4cdlLO5VJ + +IN_SYLVA_EMAIL=insylva2020@gmail.com +IN_SYLVA_EMAIL_PASSWORD=pTMy=6+? +IN_SYLVA_SMTP_HOST=smtp.gmail.com +IN_SYLVA_SMTP_PORT=465 +IN_SYLVA_SMTP_SECURE=true +IN_SYLVA_EMAIL_TO=aytac@linux.com +IN_SYLVA_EMAIL_FROM=insylva-france-adminSI@renater.fr \ No newline at end of file diff --git a/build.sh b/build.sh index 820c7ff..06490c3 100755 --- a/build.sh +++ b/build.sh @@ -148,6 +148,8 @@ export IN_SYLVA_SEARCH_PORT=$(grep IN_SYLVA_SEARCH_PORT ipconfig.txt| awk '{prin export IN_SYLVA_SEARCH_HOST=$(grep IN_SYLVA_SEARCH_HOST ipconfig.txt| awk '{print $2}') export IN_SYLVA_SEARCH_PORT=$(grep IN_SYLVA_LOGIN_PORT ipconfig.txt| awk '{print $2}') export IN_SYLVA_SEARCH_HOST=$(grep IN_SYLVA_LOGIN_HOST ipconfig.txt| awk '{print $2}') +# Attention, you can generate reCAPTCHA_site_key by following this link https://www.google.com/u/3/recaptcha/admin/site/ with In-Sylva gmail account that is named insylva2020@gmail.com +export IN_SYLVA_reCAPTCHA_site_key="6LflFcoZAAAAABawkeag3uWRAdeFZ9uSB7vJoeTg" if [ "$MODE" == "dev" ]; then export IN_SYLVA_KEYCLOAK_HOST_FOR_LOGIN="${DOMAIN}:7000/keycloak" diff --git a/docker-compose.yml b/docker-compose.yml index e020594..3cf39b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -287,6 +287,15 @@ services: KEYCLOAK_SERVER_PUBLIC_KEY: $KEYCLOAK_SERVER_PUBLIC_KEY KEYCLOAK_CREDENTIALS_SECRET: $KEYCLOAK_CREDENTIALS_SECRET + IN_SYLVA_reCAPTCHA_SECRET_KEY: $IN_SYLVA_reCAPTCHA_SECRET_KEY + + IN_SYLVA_EMAIL: $IN_SYLVA_EMAIL + IN_SYLVA_EMAIL_PASSWORD: $IN_SYLVA_EMAIL_PASSWORD + IN_SYLVA_SMTP_HOST: $IN_SYLVA_SMTP_HOST + IN_SYLVA_SMTP_PORT: $IN_SYLVA_SMTP_PORT + IN_SYLVA_SMTP_SECURE: $IN_SYLVA_SMTP_SECURE + IN_SYLVA_EMAIL_TO: $IN_SYLVA_EMAIL_TO + IN_SYLVA_EMAIL_FROM: $IN_SYLVA_EMAIL_FROM networks: - insylva-net restart: unless-stopped diff --git a/login/build.sh b/login/build.sh index ee54f79..10c2be8 100644 --- a/login/build.sh +++ b/login/build.sh @@ -20,6 +20,7 @@ docker build --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSP --build-arg IN_SYLVA_SEARCH_HOST="$IN_SYLVA_SEARCH_HOST_FOR_LOGIN" \ --build-arg IN_SYLVA_GATEKEEPER_HOST="$IN_SYLVA_GATEKEEPER_HOST_FOR_LOGIN" \ --build-arg IN_SYLVA_GATEKEEPER_PORT="4000" \ + --build-arg IN_SYLVA_reCAPTCHA_site_key="$IN_SYLVA_reCAPTCHA_site_key" --tag in-sylva.user.login ./login/.