From ff5e37260624541a17257060325131ce6fed81ad Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Fri, 7 Dec 2018 15:00:34 -0500 Subject: [PATCH 1/4] Will work on later --- templates/Yourls/0/README.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 templates/Yourls/0/README.md diff --git a/templates/Yourls/0/README.md b/templates/Yourls/0/README.md new file mode 100644 index 0000000..f7fa70a --- /dev/null +++ b/templates/Yourls/0/README.md @@ -0,0 +1,5 @@ +# YOURLS (Your Own URL Shortener) + +### Will continue this later + +https://store.docker.com/_/yourls \ No newline at end of file From 3dc3e73b40283de913570998739e18eb4551acf0 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 22 Jan 2019 16:30:49 -0500 Subject: [PATCH 2/4] Initial test configuration; folder fix 1/2 --- templates/YOURLS1/0/README.md | 5 +++ templates/YOURLS1/0/docker-compose.yml | 57 +++++++++++++++++++++++++ templates/YOURLS1/0/rancher-compose.yml | 49 +++++++++++++++++++++ templates/YOURLS1/config.yml | 8 ++++ templates/Yourls/0/README.md | 5 --- 5 files changed, 119 insertions(+), 5 deletions(-) create mode 100644 templates/YOURLS1/0/README.md create mode 100644 templates/YOURLS1/0/docker-compose.yml create mode 100644 templates/YOURLS1/0/rancher-compose.yml create mode 100644 templates/YOURLS1/config.yml delete mode 100644 templates/Yourls/0/README.md diff --git a/templates/YOURLS1/0/README.md b/templates/YOURLS1/0/README.md new file mode 100644 index 0000000..e762fd6 --- /dev/null +++ b/templates/YOURLS1/0/README.md @@ -0,0 +1,5 @@ +# YOURLS + +## Pre-Requisites + +* Traefik deployed \ No newline at end of file diff --git a/templates/YOURLS1/0/docker-compose.yml b/templates/YOURLS1/0/docker-compose.yml new file mode 100644 index 0000000..5da535f --- /dev/null +++ b/templates/YOURLS1/0/docker-compose.yml @@ -0,0 +1,57 @@ +version: '2' + +services: + yourls: + image: yourls:apache + dns: # Using Cloudflare DNS + - 1.1.1.1 + - 1.0.0.1 + environment: + YOURLS_DB_HOST: mysql + YOURLS_DB_NAME: yourls_db + YOURLS_DB_USER: yourls_user + YOURLS_DB_PASS: ${DB_USER_PASS} + YOURLS_SITE: ${TRAEFIK_HOST} + labels: + io.rancher.container.pull_image: always + {{- if .Values.HOST_LABEL}} + io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} + {{- end}} + traefik.enable: true + ### Start Web Segment + traefik.web.frontend.entryPoints: http,https + traefik.web.frontend.headers.forceSTSHeader: true + traefik.web.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information) + traefik.web.frontend.headers.SSLRedirect: true + traefik.web.frontend.headers.STSPreload: true + traefik.web.frontend.headers.STSSeconds: 15552000 + traefik.web.frontend.rule: Host:${TRAEFIK_HOST} + traefik.web.port: "80" + ### End Web Segment + links: + - mysql + restart: on-failure + volumes: + - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system + - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system + mysql: + image: mysql:5 + dns: # Using Cloudflare DNS + - 1.1.1.1 + - 1.0.0.1 + environment: + MYSQL_DATABASE: yourls_db + MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} + MYSQL_USER: yourls_user + MYSQL_PASSWORD: ${DB_USER_PASS} + labels: + io.rancher.container.pull_image: always + {{- if .Values.HOST_LABEL}} + io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} + {{- end}} + traefik.enable: false + restart: on-failure + volumes: + - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system + - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system + - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql diff --git a/templates/YOURLS1/0/rancher-compose.yml b/templates/YOURLS1/0/rancher-compose.yml new file mode 100644 index 0000000..d5e9278 --- /dev/null +++ b/templates/YOURLS1/0/rancher-compose.yml @@ -0,0 +1,49 @@ +version: '2' +catalog: + name: YOURLS + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + questions: + + - variable: "HOST_LABEL" + label: "Host Label Key/Value Pair" + description: | + The Label Key/Value pair on the host which containers should be deployed + default: "host.id=Host1" + required: false + type: string + + - variable: "TRAEFIK_HOST" + label: "Public Host Domain" + description: | + The host that Traefik will use to provide public access. + default: "subdomain.domain.tld" + required: true + type: string + + - variable: "DB_ROOT_PASS" + label: "Database Root Password" + description: | + A secure password to be used by the "root" database user. + # default: + required: true + type: password + + - variable: "DB_USER_PASS" + label: "Database User Password" + description: | + A secure password to be used by the "yourls_user" database user. + # default: + required: true + type: password + + - variable: "DATA_DIR" + label: "Data Directory" + description: | + The directory to store persistent data for the stack. + default: "Personal/YOURLS" + required: true + type: string \ No newline at end of file diff --git a/templates/YOURLS1/config.yml b/templates/YOURLS1/config.yml new file mode 100644 index 0000000..1a4dafd --- /dev/null +++ b/templates/YOURLS1/config.yml @@ -0,0 +1,8 @@ +name: YOURLS +description: | + Status: EXPERIMENTAL +version: latest +# category: +maintainer: WilliamMiceli +# license: +# projectURL: \ No newline at end of file diff --git a/templates/Yourls/0/README.md b/templates/Yourls/0/README.md deleted file mode 100644 index f7fa70a..0000000 --- a/templates/Yourls/0/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# YOURLS (Your Own URL Shortener) - -### Will continue this later - -https://store.docker.com/_/yourls \ No newline at end of file From ffc3023ac431b8db1abf563e1c821bf73bce6b02 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 22 Jan 2019 16:31:25 -0500 Subject: [PATCH 3/4] Folder fix 2/2 --- templates/{YOURLS1 => YOURLS}/0/README.md | 0 templates/{YOURLS1 => YOURLS}/0/docker-compose.yml | 0 templates/{YOURLS1 => YOURLS}/0/rancher-compose.yml | 0 templates/{YOURLS1 => YOURLS}/config.yml | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename templates/{YOURLS1 => YOURLS}/0/README.md (100%) rename templates/{YOURLS1 => YOURLS}/0/docker-compose.yml (100%) rename templates/{YOURLS1 => YOURLS}/0/rancher-compose.yml (100%) rename templates/{YOURLS1 => YOURLS}/config.yml (100%) diff --git a/templates/YOURLS1/0/README.md b/templates/YOURLS/0/README.md similarity index 100% rename from templates/YOURLS1/0/README.md rename to templates/YOURLS/0/README.md diff --git a/templates/YOURLS1/0/docker-compose.yml b/templates/YOURLS/0/docker-compose.yml similarity index 100% rename from templates/YOURLS1/0/docker-compose.yml rename to templates/YOURLS/0/docker-compose.yml diff --git a/templates/YOURLS1/0/rancher-compose.yml b/templates/YOURLS/0/rancher-compose.yml similarity index 100% rename from templates/YOURLS1/0/rancher-compose.yml rename to templates/YOURLS/0/rancher-compose.yml diff --git a/templates/YOURLS1/config.yml b/templates/YOURLS/config.yml similarity index 100% rename from templates/YOURLS1/config.yml rename to templates/YOURLS/config.yml From 65e0e4a67027fc6839fa40b087e4cc161e59ffc8 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Tue, 22 Jan 2019 16:39:57 -0500 Subject: [PATCH 4/4] Testing with SSL protocol --- templates/YOURLS/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/YOURLS/0/docker-compose.yml b/templates/YOURLS/0/docker-compose.yml index 5da535f..0fbdb04 100644 --- a/templates/YOURLS/0/docker-compose.yml +++ b/templates/YOURLS/0/docker-compose.yml @@ -11,7 +11,7 @@ services: YOURLS_DB_NAME: yourls_db YOURLS_DB_USER: yourls_user YOURLS_DB_PASS: ${DB_USER_PASS} - YOURLS_SITE: ${TRAEFIK_HOST} + YOURLS_SITE: https://${TRAEFIK_HOST} labels: io.rancher.container.pull_image: always {{- if .Values.HOST_LABEL}}