From c46b373762b32bac3360cb5f21fd469548c4e35c Mon Sep 17 00:00:00 2001 From: William Miceli <1-WilliamMiceli@git.williammiceli.systems> Date: Fri, 10 May 2019 22:26:51 -0400 Subject: [PATCH] Changed data directory to be just "/Rancher" --- templates/Bind/0/docker-compose.yml | 2 +- templates/Ghost/0/docker-compose.yml | 2 +- templates/GitLab/0/docker-compose.yml | 6 +++--- templates/Gitea/0/docker-compose.yml | 4 ++-- templates/Guacamole/0/docker-compose.yml | 6 +++--- templates/HTTPD/0/docker-compose.yml | 4 ++-- templates/InvoiceNinja/0/docker-compose.yml | 10 +++++----- templates/Nextcloud/0/docker-compose.yml | 10 +++++----- templates/Nginx/0/docker-compose.yml | 4 ++-- templates/OpenProject/0/docker-compose.yml | 6 +++--- templates/Redis/0/docker-compose.yml | 4 ++-- templates/RocketChat/0/docker-compose.yml | 4 ++-- templates/Snipe-IT/0/docker-compose.yml | 6 +++--- templates/Traefik/0/docker-compose.yml | 6 +++--- templates/WordPress/0/docker-compose.yml | 4 ++-- templates/XWiki/0/docker-compose.yml | 4 ++-- 16 files changed, 41 insertions(+), 41 deletions(-) diff --git a/templates/Bind/0/docker-compose.yml b/templates/Bind/0/docker-compose.yml index 456023a..5d6f56e 100644 --- a/templates/Bind/0/docker-compose.yml +++ b/templates/Bind/0/docker-compose.yml @@ -23,4 +23,4 @@ services: {{- end}} restart: on-failure volumes: - - /RancherCattle/${DATA_DIR}/Data:/data \ No newline at end of file + - /Rancher/${DATA_DIR}/Data:/data \ No newline at end of file diff --git a/templates/Ghost/0/docker-compose.yml b/templates/Ghost/0/docker-compose.yml index 8ec6127..a7348b0 100644 --- a/templates/Ghost/0/docker-compose.yml +++ b/templates/Ghost/0/docker-compose.yml @@ -32,4 +32,4 @@ services: 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}/Content:/var/lib/ghost/content \ No newline at end of file + - /Rancher/${DATA_DIR}/Content:/var/lib/ghost/content \ No newline at end of file diff --git a/templates/GitLab/0/docker-compose.yml b/templates/GitLab/0/docker-compose.yml index fd6abf1..20f15de 100644 --- a/templates/GitLab/0/docker-compose.yml +++ b/templates/GitLab/0/docker-compose.yml @@ -41,6 +41,6 @@ services: 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}/Config:/etc/gitlab - - /RancherCattle/${DATA_DIR}/Logs:/var/log/gitlab - - /RancherCattle/${DATA_DIR}/Data:/var/opt/gitlab \ No newline at end of file + - /Rancher/${DATA_DIR}/Config:/etc/gitlab + - /Rancher/${DATA_DIR}/Logs:/var/log/gitlab + - /Rancher/${DATA_DIR}/Data:/var/opt/gitlab \ No newline at end of file diff --git a/templates/Gitea/0/docker-compose.yml b/templates/Gitea/0/docker-compose.yml index 436b23b..80aab9e 100644 --- a/templates/Gitea/0/docker-compose.yml +++ b/templates/Gitea/0/docker-compose.yml @@ -40,7 +40,7 @@ services: 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}/Data:/data + - /Rancher/${DATA_DIR}/Data:/data postgres: image: postgres:9.6 dns: @@ -59,4 +59,4 @@ services: 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/postgresql/data \ No newline at end of file + - /Rancher/${DATA_DIR}/Database:/var/lib/postgresql/data \ No newline at end of file diff --git a/templates/Guacamole/0/docker-compose.yml b/templates/Guacamole/0/docker-compose.yml index 4076114..0a2c4c1 100644 --- a/templates/Guacamole/0/docker-compose.yml +++ b/templates/Guacamole/0/docker-compose.yml @@ -37,7 +37,7 @@ services: 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}/Setup:/setup # Used to make initial setup much simpler + - /Rancher/${DATA_DIR}/Setup:/setup # Used to make initial setup much simpler guacd: image: guacamole/guacd:latest dns: @@ -73,5 +73,5 @@ services: 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 - - /RancherCattle/${DATA_DIR}/Setup:/setup # Used to make initial setup much simpler \ No newline at end of file + - /Rancher/${DATA_DIR}/Database:/var/lib/mysql + - /Rancher/${DATA_DIR}/Setup:/setup # Used to make initial setup much simpler \ No newline at end of file diff --git a/templates/HTTPD/0/docker-compose.yml b/templates/HTTPD/0/docker-compose.yml index 811d88f..94d7a57 100644 --- a/templates/HTTPD/0/docker-compose.yml +++ b/templates/HTTPD/0/docker-compose.yml @@ -34,6 +34,6 @@ services: restart: on-failure volumes: {{- if eq .Values.PERSIST_CONF "true"}} - - /RancherCattle/${DATA_DIR}/Configuration:/usr/local/apache2/conf + - /Rancher/${DATA_DIR}/Configuration:/usr/local/apache2/conf {{- end}} - - /RancherCattle/${DATA_DIR}/Public-HTML:/usr/local/apache2/htdocs/ \ No newline at end of file + - /Rancher/${DATA_DIR}/Public-HTML:/usr/local/apache2/htdocs/ \ No newline at end of file diff --git a/templates/InvoiceNinja/0/docker-compose.yml b/templates/InvoiceNinja/0/docker-compose.yml index 7000d5f..accaeb3 100644 --- a/templates/InvoiceNinja/0/docker-compose.yml +++ b/templates/InvoiceNinja/0/docker-compose.yml @@ -18,9 +18,9 @@ services: 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}/Configuration/Invoice Ninja/.env:/var/www/app/.env - - /RancherCattle/${DATA_DIR}/Logo:/var/www/app/public/logo - - /RancherCattle/${DATA_DIR}/Storage:/var/www/app/storage + - /Rancher/${DATA_DIR}/Configuration/Invoice Ninja/.env:/var/www/app/.env + - /Rancher/${DATA_DIR}/Logo:/var/www/app/public/logo + - /Rancher/${DATA_DIR}/Storage:/var/www/app/storage cron: image: invoiceninja/invoiceninja:latest dns: @@ -67,7 +67,7 @@ services: 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 + - /Rancher/${DATA_DIR}/Database:/var/lib/mysql nginx: image: nginx dns: @@ -95,6 +95,6 @@ services: - invoiceninja restart: on-failure volumes: - - /RancherCattle/${DATA_DIR}/Configuration/NGINX/nginx.conf:/etc/nginx/nginx.conf:ro + - /Rancher/${DATA_DIR}/Configuration/NGINX/nginx.conf:/etc/nginx/nginx.conf:ro volumes_from: - invoiceninja \ No newline at end of file diff --git a/templates/Nextcloud/0/docker-compose.yml b/templates/Nextcloud/0/docker-compose.yml index 265794e..04c5a92 100644 --- a/templates/Nextcloud/0/docker-compose.yml +++ b/templates/Nextcloud/0/docker-compose.yml @@ -59,10 +59,10 @@ services: 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}/Apps:/var/www/html/custom_apps # Nextcloud apps - - /RancherCattle/${DATA_DIR}/Configuration:/var/www/html/config # Nextcloud configuration files - - /RancherCattle/${DATA_DIR}/Nextcloud:/var/www/html # Nextcloud site - - /RancherCattle/${DATA_DIR}/UserData:/var/www/html/data # Users' data file + - /Rancher/${DATA_DIR}/Apps:/var/www/html/custom_apps # Nextcloud apps + - /Rancher/${DATA_DIR}/Configuration:/var/www/html/config # Nextcloud configuration files + - /Rancher/${DATA_DIR}/Nextcloud:/var/www/html # Nextcloud site + - /Rancher/${DATA_DIR}/UserData:/var/www/html/data # Users' data file mysql: image: mysql:5 dns: # Using Cloudflare DNS @@ -83,7 +83,7 @@ services: 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 + - /Rancher/${DATA_DIR}/Database:/var/lib/mysql {{- if eq .Values.REDIS "true"}} redis: image: redis:alpine diff --git a/templates/Nginx/0/docker-compose.yml b/templates/Nginx/0/docker-compose.yml index ea98531..930245f 100644 --- a/templates/Nginx/0/docker-compose.yml +++ b/templates/Nginx/0/docker-compose.yml @@ -29,6 +29,6 @@ services: - /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 {{- if eq .Values.PERSIST_CONF "true"}} - - /RancherCattle/${DATA_DIR}/Configuration:/etc/nginx + - /Rancher/${DATA_DIR}/Configuration:/etc/nginx {{- end}} - - /RancherCattle/${DATA_DIR}/HTML:/usr/share/nginx/html + - /Rancher/${DATA_DIR}/HTML:/usr/share/nginx/html diff --git a/templates/OpenProject/0/docker-compose.yml b/templates/OpenProject/0/docker-compose.yml index 1b56631..af05e96 100644 --- a/templates/OpenProject/0/docker-compose.yml +++ b/templates/OpenProject/0/docker-compose.yml @@ -43,6 +43,6 @@ services: 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/postgresql/9.6/main - - /RancherCattle/${DATA_DIR}/Logs:/var/log/supervisor - - /RancherCattle/${DATA_DIR}/Static:/var/db/openproject \ No newline at end of file + - /Rancher/${DATA_DIR}/Database:/var/lib/postgresql/9.6/main + - /Rancher/${DATA_DIR}/Logs:/var/log/supervisor + - /Rancher/${DATA_DIR}/Static:/var/db/openproject \ No newline at end of file diff --git a/templates/Redis/0/docker-compose.yml b/templates/Redis/0/docker-compose.yml index 62a5341..8d4ad02 100644 --- a/templates/Redis/0/docker-compose.yml +++ b/templates/Redis/0/docker-compose.yml @@ -20,7 +20,7 @@ services: - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system {{- if .Values.DATA_DIR}} {{- if eq .Values.CUSTOM_CONF "true"}} - - /RancherCattle/${DATA_DIR}/Configuration/redis.conf:/usr/local/etc/redis/redis.conf + - /Rancher/${DATA_DIR}/Configuration/redis.conf:/usr/local/etc/redis/redis.conf {{- end}} - - /RancherCattle/${DATA_DIR}/Data:/data + - /Rancher/${DATA_DIR}/Data:/data {{- end}} \ No newline at end of file diff --git a/templates/RocketChat/0/docker-compose.yml b/templates/RocketChat/0/docker-compose.yml index 439514f..21cb2b5 100644 --- a/templates/RocketChat/0/docker-compose.yml +++ b/templates/RocketChat/0/docker-compose.yml @@ -44,8 +44,8 @@ services: {{- end}} traefik.enable: false volumes: - - /RancherCattle/${DATA_DIR}/Database/Data:/data/db - - /RancherCattle/${DATA_DIR}/Database/Dump:/dump + - /Rancher/${DATA_DIR}/Database/Data:/data/db + - /Rancher/${DATA_DIR}/Database/Dump:/dump command: mongod --smallfiles rocketchat: image: rocketchat/rocket.chat:latest diff --git a/templates/Snipe-IT/0/docker-compose.yml b/templates/Snipe-IT/0/docker-compose.yml index 2b168d0..ba0c621 100644 --- a/templates/Snipe-IT/0/docker-compose.yml +++ b/templates/Snipe-IT/0/docker-compose.yml @@ -38,8 +38,8 @@ services: 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}/Application:/var/lib/snipeit - - /RancherCattle/${DATA_DIR}/Backups:/var/www/html/storage/app/backups + - /Rancher/${DATA_DIR}/Application:/var/lib/snipeit + - /Rancher/${DATA_DIR}/Backups:/var/www/html/storage/app/backups mysql: image: mysql:5 dns: @@ -60,4 +60,4 @@ services: 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 + - /Rancher/${DATA_DIR}/Database:/var/lib/mysql diff --git a/templates/Traefik/0/docker-compose.yml b/templates/Traefik/0/docker-compose.yml index adad710..6db801b 100644 --- a/templates/Traefik/0/docker-compose.yml +++ b/templates/Traefik/0/docker-compose.yml @@ -23,6 +23,6 @@ services: - /var/run/docker.sock:/var/run/docker.sock - /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}/Configuration/traefik.toml:/traefik.toml - - /RancherCattle/${DATA_DIR}/LetsEncrypt/acme.json:/acme.json # For Let's Encrypt certificates - - /RancherCattle/${DATA_DIR}/Logs:/external/logs \ No newline at end of file + - /Rancher/${DATA_DIR}/Configuration/traefik.toml:/traefik.toml + - /Rancher/${DATA_DIR}/LetsEncrypt/acme.json:/acme.json # For Let's Encrypt certificates + - /Rancher/${DATA_DIR}/Logs:/external/logs \ No newline at end of file diff --git a/templates/WordPress/0/docker-compose.yml b/templates/WordPress/0/docker-compose.yml index 3663120..65d3d9d 100644 --- a/templates/WordPress/0/docker-compose.yml +++ b/templates/WordPress/0/docker-compose.yml @@ -34,7 +34,7 @@ services: 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}/Wordpress:/var/www/html + - /Rancher/${DATA_DIR}/Wordpress:/var/www/html mysql: image: mysql:5 dns: @@ -54,4 +54,4 @@ services: 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 \ No newline at end of file + - /Rancher/${DATA_DIR}/Database:/var/lib/mysql \ No newline at end of file diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index ad8cead..bd73af2 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -36,7 +36,7 @@ services: 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}/XWiki:/usr/local/xwiki + - /Rancher/${DATA_DIR}/XWiki:/usr/local/xwiki postgresql: image: postgres:alpine dns: @@ -61,4 +61,4 @@ services: 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/postgresql/data \ No newline at end of file + - /Rancher/${DATA_DIR}/Database:/var/lib/postgresql/data \ No newline at end of file