From 32d80f0ade3cd344852d68dea46f8f5dec39281d Mon Sep 17 00:00:00 2001 From: Zicklag Date: Wed, 31 Jan 2018 14:51:44 -0600 Subject: [PATCH] Made changes related to @rawmind0's code review --- templates/huginn/0/docker-compose.yml | 106 ++++++++++++------------- templates/huginn/0/rancher-compose.yml | 17 ++++ 2 files changed, 68 insertions(+), 55 deletions(-) diff --git a/templates/huginn/0/docker-compose.yml b/templates/huginn/0/docker-compose.yml index d58834b..84c8458 100644 --- a/templates/huginn/0/docker-compose.yml +++ b/templates/huginn/0/docker-compose.yml @@ -3,110 +3,106 @@ version: '2' services: postgres: image: postgres:9.5 + restart: always volumes: - postgres-data:/var/lib/postgresql/data environment: POSTGRES_PASSWORD: ${DB_PASSWORD} - POSTGRES_USER: huginn - POSTGRES_DB: huginn + POSTGRES_USER: ${DB_USER} + POSTGRES_DB: ${DB_NAME} http_proxy: https_proxy: - labels: - io.rancher.container.pull_image: always huginn-web: image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a restart: always + external_links: + - postgres: postgres environment: DATABASE_ADAPTER: postgresql POSTGRES_PORT_5432_TCP_ADDR: postgres POSTGRES_PORT_5432_TCP_PORT: 5432 - DATABASE_ADAPTER: postgresql - DATABASE_NAME: huginn - DATABASE_USERNAME: huginn + DATABASE_NAME: ${DB_NAME} + DATABASE_USERNAME: ${DB_USER} DATABASE_PASSWORD: ${DB_PASSWORD} APP_SECRET_TOKEN: ${APP_SECRET_TOKEN} - DOMAIN: $DOMAIN - INVITATION_CODE: $INVITATION_CODE - SKIP_INVITATION_CODE: $SKIP_INVITATION_CODE - REQUIRE_CONFIRMED_EMAIL: true - SMTP_DOMAIN: $DOMAIN - SMTP_USER_NAME: $SMTP_USER_NAME - SMTP_PASSWORD: $SMTP_PASSWORD - SMTP_SERVER: $SMTP_SERVER - SMTP_PORT: $SMTP_PORT - SMTP_AUTHENTICATION: $SMTP_AUTHENTICATION + DOMAIN: ${DOMAIN} + INVITATION_CODE: ${INVITATION_CODE} + SKIP_INVITATION_CODE: ${SKIP_INVITATION_CODE} + REQUIRE_CONFIRMED_EMAIL: ${REQUIRE_CONFIRMED_EMAIL} + SMTP_DOMAIN: ${DOMAIN} + SMTP_USER_NAME: ${SMTP_USER_NAME} + SMTP_PASSWORD: ${SMTP_PASSWORD} + SMTP_SERVER: ${SMTP_SERVER} + SMTP_PORT: ${SMTP_PORT} + SMTP_AUTHENTICATION: ${SMTP_AUTHENTICATION} SMTP_ENABLE_STARTTLS_AUTO: true USE_EVERNOTE_SANDBOX: false - EMAIL_FROM_ADDRESS: $EMAIL_FROM_ADDRESS - ADDITIONAL_GEMS: $ADDITIONAL_GEMS + EMAIL_FROM_ADDRESS: ${EMAIL_FROM_ADDRESS} + ADDITIONAL_GEMS: ${ADDITIONAL_GEMS} http_proxy: https_proxy: - labels: - io.rancher.container.pull_image: always huginn-agent-runner: image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a restart: always + external_links: + - postgres: postgres environment: DATABASE_ADAPTER: postgresql POSTGRES_PORT_5432_TCP_ADDR: postgres POSTGRES_PORT_5432_TCP_PORT: 5432 - DATABASE_ADAPTER: postgresql - DATABASE_NAME: huginn - DATABASE_USERNAME: huginn + DATABASE_NAME: ${DB_NAME} + DATABASE_USERNAME: ${DB_USER} DATABASE_PASSWORD: ${DB_PASSWORD} APP_SECRET_TOKEN: ${APP_SECRET_TOKEN} - DOMAIN: $DOMAIN - INVITATION_CODE: $INVITATION_CODE - SKIP_INVITATION_CODE: $SKIP_INVITATION_CODE - REQUIRE_CONFIRMED_EMAIL: true - SMTP_DOMAIN: $DOMAIN - SMTP_USER_NAME: $SMTP_USER_NAME - SMTP_PASSWORD: $SMTP_PASSWORD - SMTP_SERVER: $SMTP_SERVER - SMTP_PORT: $SMTP_PORT - SMTP_AUTHENTICATION: $SMTP_AUTHENTICATION + DOMAIN: ${DOMAIN} + INVITATION_CODE: ${INVITATION_CODE} + SKIP_INVITATION_CODE: ${SKIP_INVITATION_CODE} + REQUIRE_CONFIRMED_EMAIL: ${REQUIRE_CONFIRMED_EMAIL} + SMTP_DOMAIN: ${DOMAIN} + SMTP_USER_NAME: ${SMTP_USER_NAME} + SMTP_PASSWORD: ${SMTP_PASSWORD} + SMTP_SERVER: ${SMTP_SERVER} + SMTP_PORT: ${SMTP_PORT} + SMTP_AUTHENTICATION: ${SMTP_AUTHENTICATION} SMTP_ENABLE_STARTTLS_AUTO: true USE_EVERNOTE_SANDBOX: false - EMAIL_FROM_ADDRESS: $EMAIL_FROM_ADDRESS - ADDITIONAL_GEMS: $ADDITIONAL_GEMS + EMAIL_FROM_ADDRESS: ${EMAIL_FROM_ADDRESS} + ADDITIONAL_GEMS: ${ADDITIONAL_GEMS} http_proxy: https_proxy: - labels: - io.rancher.container.pull_image: always command: /scripts/init bin/agent_runner.rb huginn-delayed-job: image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a restart: always + external_links: + - postgres: postgres environment: DATABASE_ADAPTER: postgresql POSTGRES_PORT_5432_TCP_ADDR: postgres POSTGRES_PORT_5432_TCP_PORT: 5432 - DATABASE_ADAPTER: postgresql - DATABASE_NAME: huginn - DATABASE_USERNAME: huginn + DATABASE_NAME: ${DB_NAME} + DATABASE_USERNAME: ${DB_USER} DATABASE_PASSWORD: ${DB_PASSWORD} APP_SECRET_TOKEN: ${APP_SECRET_TOKEN} - DOMAIN: $DOMAIN - INVITATION_CODE: $INVITATION_CODE - SKIP_INVITATION_CODE: $SKIP_INVITATION_CODE - REQUIRE_CONFIRMED_EMAIL: true - SMTP_DOMAIN: $DOMAIN - SMTP_USER_NAME: $SMTP_USER_NAME - SMTP_PASSWORD: $SMTP_PASSWORD - SMTP_SERVER: $SMTP_SERVER - SMTP_PORT: $SMTP_PORT - SMTP_AUTHENTICATION: $SMTP_AUTHENTICATION + DOMAIN: ${DOMAIN} + INVITATION_CODE: ${INVITATION_CODE} + SKIP_INVITATION_CODE: ${SKIP_INVITATION_CODE} + REQUIRE_CONFIRMED_EMAIL: ${REQUIRE_CONFIRMED_EMAIL} + SMTP_DOMAIN: ${DOMAIN} + SMTP_USER_NAME: ${SMTP_USER_NAME} + SMTP_PASSWORD: ${SMTP_PASSWORD} + SMTP_SERVER: ${SMTP_SERVER} + SMTP_PORT: ${SMTP_PORT} + SMTP_AUTHENTICATION: ${SMTP_AUTHENTICATION} SMTP_ENABLE_STARTTLS_AUTO: true USE_EVERNOTE_SANDBOX: false - EMAIL_FROM_ADDRESS: $EMAIL_FROM_ADDRESS - ADDITIONAL_GEMS: $ADDITIONAL_GEMS + EMAIL_FROM_ADDRESS: ${EMAIL_FROM_ADDRESS} + ADDITIONAL_GEMS: ${ADDITIONAL_GEMS} http_proxy: https_proxy: - labels: - io.rancher.container.pull_image: always command: /scripts/init script/delayed_job run volumes: diff --git a/templates/huginn/0/rancher-compose.yml b/templates/huginn/0/rancher-compose.yml index 457ad10..22ebff6 100644 --- a/templates/huginn/0/rancher-compose.yml +++ b/templates/huginn/0/rancher-compose.yml @@ -9,6 +9,23 @@ catalog: label: Database Password required: true type: password + - variable: DB_NAME + description: The database name + label: Database Name + required: true + default: "huginn" + type: string + - variable: DB_USER + description: The database username + label: Database Username + required: true + default: "huginn" + type: string + - variable: APP_SECRET_TOKEN + description: The secret token used by Huginn + label: App Secret Token + required: true + type: password - variable: DOMAIN description: The domain and port ( if necessary ) that should be used to get to Huginn label: Domain