wip

.env.sample

@@ -4,8 +4,6 @@ DOMAIN=karrot.example.com
 
 # account id for maxmind (for GeoIP)
 MAXMIND_ACCOUNT_ID=
-# License key for maxmind 
-MAXMIND_LICENSE_KEY=
 
 SITE_NAME=karrot dev
 SITE_LOGO=https://user-images.githubusercontent.com/31616/36565633-517373a4-1821-11e8-9948-5bf6887c667e.png
@@ -13,12 +11,11 @@ SITE_LOGO=https://user-images.githubusercontent.com/31616/36565633-517373a4-1821
 # postal,smtp,console
 EMAIL_BACKEND=console
 # only set those when using SMTP
-#EMAIL_FROM=
 # SMTP USER and EMAIL_FROM are usually the same
+#EMAIL_FROM=
 #SMTP_USER=
-#SMTP_PASSWORD=
 #SMTP_HOST=
-#SMTP_USE_SLL=
+#SMTP_USE_SSL=
 #SMTP_USE_TLS=true
 #SMTP_PORT=587
 
@@ -26,6 +23,6 @@ SITE_URL=https://${DOMAIN}
 LETS_ENCRYPT_ENV=production
 
 SECRET_DB_PASSWORD_VERSION=v1
-SECRET_KEY_VERSION=v1
+SECRET_SECRET_KEY_VERSION=v1
 SECRET_MAXMIND_LICENSE_KEY_VERSION=v1
 SECRET_SMTP_PASSWORD_VERSION=v1

abra.sh

@@ -1,2 +1,3 @@
 export NGINX_CONFIG_VERSION=v1
 export GEOIP_CONFIG_VERSION=v1
+export ENTRYPOINT_VERSION=v1

compose.yml

@@ -183,7 +183,7 @@ secrets:
     name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
   secret_key:
     external: true
-    name: ${STACK_NAME}_secret_key_${SECRET_KEY_VERSION}
+    name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION}
   maxmind_license_key:
     external: true
     name: ${STACK_NAME}_maxmind_license_key_${SECRET_MAXMIND_LICENSE_KEY_VERSION}