From 86242bed6ff88a9ae36a2c92c8e784fea127d9b4 Mon Sep 17 00:00:00 2001 From: Zicklag Date: Mon, 22 Jan 2018 13:28:07 -0600 Subject: [PATCH 1/9] Added a new Huginn cattle template --- templates/huginn/0/README.md | 23 +++++ templates/huginn/0/docker-compose.yml | 114 +++++++++++++++++++++++++ templates/huginn/0/rancher-compose.yml | 86 +++++++++++++++++++ templates/huginn/config.yml | 6 ++ 4 files changed, 229 insertions(+) create mode 100644 templates/huginn/0/README.md create mode 100644 templates/huginn/0/docker-compose.yml create mode 100644 templates/huginn/0/rancher-compose.yml create mode 100644 templates/huginn/config.yml diff --git a/templates/huginn/0/README.md b/templates/huginn/0/README.md new file mode 100644 index 0000000..2cba211 --- /dev/null +++ b/templates/huginn/0/README.md @@ -0,0 +1,23 @@ +# Huginn + +Your agents are standing by! + +[Huginn](https://github.com/huginn/huginn) is a tool that allows you to automate tasks on the internet and/or your private intranet. + +## Installation + +When huginn first starts up it will create one user named, `admin`, with the password, `password`, along with a number of example agents for that user. Each new user will start off with a set of example agents. + +The Huggin web interface is served in the `huginn_web` container on port `3000`. In order to get web traffic to the container you have to create a Rancher load balancer and route the traffic to the container on port `3000`. + +## Scaling + +The `huginn-web` service *can* be scaled to provide a redundant web interface or to account for a large amount of traffic, but scaling is usually unnecessary. + +The `huginn-agent-runner` service **cannot** be scaled as it is the agent scheduler. Running multiple `huginn-agent-runner` services would result in jobs running multiple times. Running only a single `huginn-agent-runner` container should not be a HA concern because the container does not represent any significant load and because the container will restart automatically in case of a failure. In the event of a container restart, there will a momentary pause in agent scheduling, but that should not represent any issue. + +The `huginn-delayed-job` service can and should be scaled up if you have a large number of agents. This will distribute the tasks over more containers. + +## Configuration + +For more information on configuration options see [this example environment file](https://github.com/huginn/huginn/blob/master/.env.example) from the Huginn project. diff --git a/templates/huginn/0/docker-compose.yml b/templates/huginn/0/docker-compose.yml new file mode 100644 index 0000000..d94586e --- /dev/null +++ b/templates/huginn/0/docker-compose.yml @@ -0,0 +1,114 @@ +version: '2' + +services: + postgres: + image: postgres:9.5 + volumes: + - postgres-data:/var/lib/postgresql/data + environment: + POSTGRES_PASSWORD: ${DB_PASSWORD} + POSTGRES_USER: huginn + POSTGRES_DB: huginn + http_proxy: + https_proxy: + labels: + io.rancher.container.pull_image: always + + huginn-web: + image: huginn/huginn-single-process + restart: always + 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_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 + SMTP_ENABLE_STARTTLS_AUTO: true + USE_EVERNOTE_SANDBOX: false + 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 + restart: always + 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_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 + SMTP_ENABLE_STARTTLS_AUTO: true + USE_EVERNOTE_SANDBOX: false + 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 + restart: always + 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_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 + SMTP_ENABLE_STARTTLS_AUTO: true + USE_EVERNOTE_SANDBOX: false + 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: + postgres-data: + driver: ${STORAGE_DRIVER} diff --git a/templates/huginn/0/rancher-compose.yml b/templates/huginn/0/rancher-compose.yml new file mode 100644 index 0000000..bc9030d --- /dev/null +++ b/templates/huginn/0/rancher-compose.yml @@ -0,0 +1,86 @@ +version: '2' +catalog: + name: Huginn + version: 0.1 + description: Web automation framework. Your agents are standing by! + questions: + - variable: DB_PASSWORD + description: The database password + label: Database Password + required: true + type: password + - variable: DOMAIN + description: The domain and port that Huginn will be hosted on + label: Domain + required: true + default: example.com:443 + type: string + - variable: INVITATION_CODE + description: Code that new users must use to register + label: Invitation Code + required: true + default: try-huginn + type: string + - variable: SKIP_INVITATION_CODE + description: Don't require users to have an invitation code to register + label: Skip Invitation Code + required: true + default: false + type: boolean + - variable: REQUIRE_CONFIRMED_EMAIL + description: Require newly registered users to confirm their Email address + label: Require Confirmed Email + required: true + default: true + type: boolean + - variable: SMTP_USER_NAME + label: SMTP Username + required: false + default: you@gmail.com + type: string + - variable: SMTP_PASSWORD + label: SMTP Password + required: false + default: password + type: password + - variable: SMTP_SERVER + label: SMTP Server + required: false + default: smtp.gmail.com + type: string + - variable: SMTP_PORT + label: SMTP Port + required: false + default: 587 + type: string + - variable: EMAIL_FROM_ADDRESS + label: Email From Address + required: false + default: noreply@something.com + type: string + - variable: SMTP_AUTHENTICATION + label: SMTP Authentication Method + default: plain + required: false + type: enum + options: + - plain + - login + - variable: ADDITIONAL_GEMS + description: Additional ruby gems to install. Can be used to provide additional huginn agents + label: Additional Gems + required: false + type: string +services: + postgres: + scale: 1 + start_on_create: true + huginn-web: + scale: 1 + start_on_create: true + huginn-agent-runner: + scale: 1 + start_on_create: true + huginn-delayed-job: + scale: 1 + start_on_create: true diff --git a/templates/huginn/config.yml b/templates/huginn/config.yml new file mode 100644 index 0000000..324f732 --- /dev/null +++ b/templates/huginn/config.yml @@ -0,0 +1,6 @@ +name: Huginn +description: | + Web automation framework. Your agents are standing by! +version: 0.1 +category: Automation +maintainer: Zicklag (zicklag@katharostech.com) From 9ab088b0ed2ce52250441d75c0651aa1c087e6c6 Mon Sep 17 00:00:00 2001 From: Zicklag Date: Mon, 22 Jan 2018 14:25:22 -0600 Subject: [PATCH 2/9] Updated config.yml and added catalog icon --- templates/huginn/catalogIcon-huginn.svg | 52 +++++++++++++++++++++++++ templates/huginn/config.yml | 2 + 2 files changed, 54 insertions(+) create mode 100644 templates/huginn/catalogIcon-huginn.svg diff --git a/templates/huginn/catalogIcon-huginn.svg b/templates/huginn/catalogIcon-huginn.svg new file mode 100644 index 0000000..4459427 --- /dev/null +++ b/templates/huginn/catalogIcon-huginn.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/huginn/config.yml b/templates/huginn/config.yml index 324f732..614a594 100644 --- a/templates/huginn/config.yml +++ b/templates/huginn/config.yml @@ -3,4 +3,6 @@ description: | Web automation framework. Your agents are standing by! version: 0.1 category: Automation +license: MIT maintainer: Zicklag (zicklag@katharostech.com) +projectURL: https://github.com/huginn/huginn/ From e8be8a93c7302a8b3c39071eaabbfa5a2504aebe Mon Sep 17 00:00:00 2001 From: Zicklag Date: Mon, 22 Jan 2018 14:42:10 -0600 Subject: [PATCH 3/9] Fixed maintainer and version fields * Fixed format of maintainer email address. * Fixed template version number by putting quotation marks around it to make it a string. --- templates/huginn/0/rancher-compose.yml | 2 +- templates/huginn/config.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/huginn/0/rancher-compose.yml b/templates/huginn/0/rancher-compose.yml index bc9030d..2d4c317 100644 --- a/templates/huginn/0/rancher-compose.yml +++ b/templates/huginn/0/rancher-compose.yml @@ -1,7 +1,7 @@ version: '2' catalog: name: Huginn - version: 0.1 + version: "0.1" description: Web automation framework. Your agents are standing by! questions: - variable: DB_PASSWORD diff --git a/templates/huginn/config.yml b/templates/huginn/config.yml index 614a594..e412fe8 100644 --- a/templates/huginn/config.yml +++ b/templates/huginn/config.yml @@ -1,8 +1,8 @@ name: Huginn description: | Web automation framework. Your agents are standing by! -version: 0.1 +version: "0.1" category: Automation license: MIT -maintainer: Zicklag (zicklag@katharostech.com) +maintainer: Zicklag projectURL: https://github.com/huginn/huginn/ From c48f195575413dab212f1bb73b349621f3b1517b Mon Sep 17 00:00:00 2001 From: Zicklag Date: Thu, 25 Jan 2018 11:58:38 -0600 Subject: [PATCH 4/9] Implemented requested changes * Made docker images specific * Added STORAGE_DRIVER question to rancher-compose In addition: * Updated README with important usage note concerning email confirmation --- templates/huginn/0/README.md | 2 ++ templates/huginn/0/docker-compose.yml | 6 +++--- templates/huginn/0/rancher-compose.yml | 8 +++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/templates/huginn/0/README.md b/templates/huginn/0/README.md index 2cba211..ad2bb0f 100644 --- a/templates/huginn/0/README.md +++ b/templates/huginn/0/README.md @@ -8,6 +8,8 @@ Your agents are standing by! When huginn first starts up it will create one user named, `admin`, with the password, `password`, along with a number of example agents for that user. Each new user will start off with a set of example agents. +**Warning**: The **Require Confirmed Email** option *must* be **off** when you first start up the stack because the default user has a fake email address and will not allow you to login. If desired, you can upgrade the stack and turn email verification back on after changing the admin's email address. + The Huggin web interface is served in the `huginn_web` container on port `3000`. In order to get web traffic to the container you have to create a Rancher load balancer and route the traffic to the container on port `3000`. ## Scaling diff --git a/templates/huginn/0/docker-compose.yml b/templates/huginn/0/docker-compose.yml index d94586e..d58834b 100644 --- a/templates/huginn/0/docker-compose.yml +++ b/templates/huginn/0/docker-compose.yml @@ -15,7 +15,7 @@ services: io.rancher.container.pull_image: always huginn-web: - image: huginn/huginn-single-process + image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a restart: always environment: DATABASE_ADAPTER: postgresql @@ -46,7 +46,7 @@ services: io.rancher.container.pull_image: always huginn-agent-runner: - image: huginn/huginn-single-process + image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a restart: always environment: DATABASE_ADAPTER: postgresql @@ -78,7 +78,7 @@ services: command: /scripts/init bin/agent_runner.rb huginn-delayed-job: - image: huginn/huginn-single-process + image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a restart: always environment: DATABASE_ADAPTER: postgresql diff --git a/templates/huginn/0/rancher-compose.yml b/templates/huginn/0/rancher-compose.yml index 2d4c317..6033748 100644 --- a/templates/huginn/0/rancher-compose.yml +++ b/templates/huginn/0/rancher-compose.yml @@ -31,7 +31,7 @@ catalog: description: Require newly registered users to confirm their Email address label: Require Confirmed Email required: true - default: true + default: false type: boolean - variable: SMTP_USER_NAME label: SMTP Username @@ -71,6 +71,12 @@ catalog: label: Additional Gems required: false type: string + - variable: STORAGE_DRIVER + description: Rancher storage driver to use for database volume + label: Storage Driver + default: local + required: true + type: string services: postgres: scale: 1 From 6de4288b28253463f4ca6355f8e042c176635994 Mon Sep 17 00:00:00 2001 From: Zicklag Date: Thu, 25 Jan 2018 12:01:39 -0600 Subject: [PATCH 5/9] Put quotes around the maintainer email address --- templates/huginn/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/huginn/config.yml b/templates/huginn/config.yml index e412fe8..239163b 100644 --- a/templates/huginn/config.yml +++ b/templates/huginn/config.yml @@ -4,5 +4,5 @@ description: | version: "0.1" category: Automation license: MIT -maintainer: Zicklag +maintainer: "Zicklag " projectURL: https://github.com/huginn/huginn/ From 915811c2acdfecb28b02d2fe8ad5c1c67745b1e1 Mon Sep 17 00:00:00 2001 From: Zicklag Date: Thu, 25 Jan 2018 12:09:03 -0600 Subject: [PATCH 6/9] Clarified misleading DOMAIN example --- templates/huginn/0/rancher-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/huginn/0/rancher-compose.yml b/templates/huginn/0/rancher-compose.yml index 6033748..457ad10 100644 --- a/templates/huginn/0/rancher-compose.yml +++ b/templates/huginn/0/rancher-compose.yml @@ -10,10 +10,10 @@ catalog: required: true type: password - variable: DOMAIN - description: The domain and port that Huginn will be hosted on + description: The domain and port ( if necessary ) that should be used to get to Huginn label: Domain required: true - default: example.com:443 + default: example.com type: string - variable: INVITATION_CODE description: Code that new users must use to register From 625adadd9a3e9fc3687425b84c626c03cba46e11 Mon Sep 17 00:00:00 2001 From: Zicklag Date: Thu, 25 Jan 2018 13:59:08 -0600 Subject: [PATCH 7/9] Put my name in the maintainer field --- templates/huginn/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/huginn/config.yml b/templates/huginn/config.yml index 239163b..f600e9d 100644 --- a/templates/huginn/config.yml +++ b/templates/huginn/config.yml @@ -4,5 +4,5 @@ description: | version: "0.1" category: Automation license: MIT -maintainer: "Zicklag " +maintainer: "Kapono Haws " projectURL: https://github.com/huginn/huginn/ From 32d80f0ade3cd344852d68dea46f8f5dec39281d Mon Sep 17 00:00:00 2001 From: Zicklag Date: Wed, 31 Jan 2018 14:51:44 -0600 Subject: [PATCH 8/9] 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 From a595146dcedde3939c8a894594e33fc8e9b12535 Mon Sep 17 00:00:00 2001 From: Zicklag Date: Thu, 1 Feb 2018 13:17:39 -0600 Subject: [PATCH 9/9] Fixed external links --- templates/huginn/0/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/huginn/0/docker-compose.yml b/templates/huginn/0/docker-compose.yml index 84c8458..491135a 100644 --- a/templates/huginn/0/docker-compose.yml +++ b/templates/huginn/0/docker-compose.yml @@ -17,7 +17,7 @@ services: image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a restart: always external_links: - - postgres: postgres + - postgres:postgres environment: DATABASE_ADAPTER: postgresql POSTGRES_PORT_5432_TCP_ADDR: postgres @@ -47,7 +47,7 @@ services: image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a restart: always external_links: - - postgres: postgres + - postgres:postgres environment: DATABASE_ADAPTER: postgresql POSTGRES_PORT_5432_TCP_ADDR: postgres @@ -78,7 +78,7 @@ services: image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a restart: always external_links: - - postgres: postgres + - postgres:postgres environment: DATABASE_ADAPTER: postgresql POSTGRES_PORT_5432_TCP_ADDR: postgres