From 94b3556122528bbb879114f571b7ca7bc1b18f6a Mon Sep 17 00:00:00 2001 From: stebifan Date: Mon, 16 Apr 2018 23:09:04 +0200 Subject: [PATCH] final --- templates/meshviewer/0/docker-compose.yml | 43 +++++++++++++++++++++- templates/meshviewer/0/rancher-compose.yml | 11 +++++- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/templates/meshviewer/0/docker-compose.yml b/templates/meshviewer/0/docker-compose.yml index 090208d..0c734ab 100644 --- a/templates/meshviewer/0/docker-compose.yml +++ b/templates/meshviewer/0/docker-compose.yml @@ -49,7 +49,7 @@ services: labels: io.rancher.container.hostname_override: container_name - letsencrypt: + letsencrypt-map: image: janeczku/rancher-letsencrypt:v0.5.0 environment: API_VERSION: Production @@ -90,6 +90,47 @@ services: io.rancher.container.create_agent: 'true' service: letsencrypt + letsencrypt-grafana: + image: janeczku/rancher-letsencrypt:v0.5.0 + environment: + API_VERSION: Production + AWS_ACCESS_KEY: '' + AWS_SECRET_KEY: '' + AZURE_CLIENT_ID: '' + AZURE_CLIENT_SECRET: '' + AZURE_RESOURCE_GROUP: '' + AZURE_SUBSCRIPTION_ID: '' + AZURE_TENANT_ID: '' + CERT_NAME: ${GRAFANA_DOMAIN} + CLOUDFLARE_EMAIL: '' + CLOUDFLARE_KEY: '' + DNSIMPLE_EMAIL: '' + DNSIMPLE_KEY: '' + DNS_RESOLVERS: 8.8.8.8:53,8.8.4.4:53 + DOMAINS: ${GRAFANA_DOMAIN} + DO_ACCESS_TOKEN: '' + DYN_CUSTOMER_NAME: '' + DYN_PASSWORD: '' + DYN_USER_NAME: '' + EMAIL: s.hoffmann@hoffmann-hosting.de + EULA: 'Yes' + GANDI_API_KEY: '' + OVH_APPLICATION_KEY: '' + OVH_APPLICATION_SECRET: '' + OVH_CONSUMER_KEY: '' + PROVIDER: HTTP + PUBLIC_KEY_TYPE: RSA-2048 + RENEWAL_PERIOD_DAYS: '20' + RENEWAL_TIME: '12' + VULTR_API_KEY: '' + volumes: + - /var/lib/rancher:/var/lib/rancher + - zertifikate:/etc/letsencrypt + labels: + io.rancher.container.agent.role: environment + io.rancher.container.create_agent: 'true' + service: letsencrypt + volumes: meshviewer-data: driver: rancher-nfs diff --git a/templates/meshviewer/0/rancher-compose.yml b/templates/meshviewer/0/rancher-compose.yml index 3221432..89f3ea1 100644 --- a/templates/meshviewer/0/rancher-compose.yml +++ b/templates/meshviewer/0/rancher-compose.yml @@ -61,10 +61,17 @@ services: scale: 1 start_on_create: true - letsencrypt: + letsencrypt-map: scale: 1 start_on_create: true lb_config: port_rules: - target_port: 80 - hostname: ${DOMAIN} \ No newline at end of file + hostname: ${DOMAIN} + letsencrypt-grafana: + scale: 1 + start_on_create: true + lb_config: + port_rules: + - target_port: 80 + hostname: ${GRAFANA_DOMAIN} \ No newline at end of file