Merge branch 'development' into 'master'

Updated root directory

See merge request WilliamMiceli/personal-rancher-catalog!2

templates/Bind/0/docker-compose.yml

@@ -25,4 +25,4 @@ services:
       {{- end}}
     restart: on-failure
     volumes:
-      - /Rancher/${DATA_DIR}/Data:/data
+      - /Persistent/${DATA_DIR}/Data:/data

templates/Cryptpad/0/docker-compose.yml

@@ -29,10 +29,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}/Blob:/cryptpad/blob
+      - /Persistent/${DATA_DIR}/Blob:/cryptpad/blob
-      - /RancherCattle/${DATA_DIR}/BlobStage:/cryptpad/blobstage
+      - /Persistent/${DATA_DIR}/BlobStage:/cryptpad/blobstage
-      - /RancherCattle/${DATA_DIR}/Block:/cryptpad/block
+      - /Persistent/${DATA_DIR}/Block:/cryptpad/block
-      - /RancherCattle/${DATA_DIR}/Configuration:/cryptpad/customize
+      - /Persistent/${DATA_DIR}/Configuration:/cryptpad/customize
-      - /RancherCattle/${DATA_DIR}/Data:/cryptpad/datastore
+      - /Persistent/${DATA_DIR}/Data:/cryptpad/datastore
-      - /RancherCattle/${DATA_DIR}/Pins:/cryptpad/pins
+      - /Persistent/${DATA_DIR}/Pins:/cryptpad/pins
-      - /RancherCattle/${DATA_DIR}/Tasks:/cryptpad/tasks
+      - /Persistent/${DATA_DIR}/Tasks:/cryptpad/tasks

templates/Ghost/0/docker-compose.yml

@@ -34,4 +34,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
-      - /Rancher/${DATA_DIR}/Content:/var/lib/ghost/content
+      - /Persistent/${DATA_DIR}/Content:/var/lib/ghost/content

templates/GitLab-Runner/0/docker-compose.yml

@@ -41,7 +41,7 @@ services:
       traefik.enable: false
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - /Rancher/${DATA_DIR}:/etc/gitlab-runner
+      - /Persistent/${DATA_DIR}:/etc/gitlab-runner
   gitlab-runner:
     image: gitlab/gitlab-runner:alpine # Alpine Linux image is designed to use only Docker as the method of spawning runners
     command:
@@ -61,4 +61,4 @@ services:
     restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - /Rancher/${DATA_DIR}:/etc/gitlab-runner
+      - /Persistent/${DATA_DIR}:/etc/gitlab-runner

templates/GitLab/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
-      - /Rancher/${DATA_DIR}/Config:/etc/gitlab
+      - /Persistent/${DATA_DIR}/Config:/etc/gitlab
-      - /Rancher/${DATA_DIR}/Logs:/var/log/gitlab
+      - /Persistent/${DATA_DIR}/Logs:/var/log/gitlab
-      - /Rancher/${DATA_DIR}/Data:/var/opt/gitlab
+      - /Persistent/${DATA_DIR}/Data:/var/opt/gitlab

templates/Gitea/0/docker-compose.yml

@@ -42,7 +42,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
-      - /Rancher/${DATA_DIR}/Data:/data
+      - /Persistent/${DATA_DIR}/Data:/data
   postgres:
     image: postgres:9.6
     dns:
@@ -63,4 +63,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
-      - /Rancher/${DATA_DIR}/Database:/var/lib/postgresql/data
+      - /Persistent/${DATA_DIR}/Database:/var/lib/postgresql/data

templates/Grav/0/docker-compose.yml

@@ -29,6 +29,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
-      - /Rancher/${DATA_DIR}/Backups:/var/www/backup # Backups
+      - /Persistent/${DATA_DIR}/Backups:/var/www/backup # Backups
-      - /Rancher/${DATA_DIR}/Images:/var/www/images # Images
+      - /Persistent/${DATA_DIR}/Logs:/var/www/logs # Logs
-      - /Rancher/${DATA_DIR}/User:/var/www/user # User Data
+      - /Persistent/${DATA_DIR}/User:/var/www/user # User

templates/Guacamole/0/docker-compose.yml

@@ -20,7 +20,6 @@ services:
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
       {{- end}}
       traefik.enable: true
-
       ### Start Web Segment
       traefik.frontend.entryPoints: http,https
       traefik.frontend.headers.forceSTSHeader: true
@@ -39,7 +38,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
-      - /Rancher/${DATA_DIR}/Setup:/setup # Used to make initial setup much simpler
+      - /Persistent/${DATA_DIR}/Setup:/setup # Used to make initial setup much simpler
   guacd:
     image: guacamole/guacd:latest
     dns:
@@ -77,5 +76,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
-      - /Rancher/${DATA_DIR}/Database:/var/lib/mysql
+      - /Persistent/${DATA_DIR}/Database:/var/lib/mysql
-      - /Rancher/${DATA_DIR}/Setup:/setup # Used to make initial setup much simpler
+      - /Persistent/${DATA_DIR}/Setup:/setup # Used to make initial setup much simpler

templates/HTTPD/0/docker-compose.yml

@@ -38,6 +38,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"}}
-      - /Rancher/${DATA_DIR}/Configuration:/usr/local/apache2/conf
+      - /Persistent/${DATA_DIR}/Configuration:/usr/local/apache2/conf
       {{- end}}
-      - /Rancher/${DATA_DIR}/Public-HTML:/usr/local/apache2/htdocs/
+      - /Persistent/${DATA_DIR}/Public-HTML:/usr/local/apache2/htdocs/

templates/InvoiceNinja/0/docker-compose.yml

@@ -20,9 +20,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
-      - /Rancher/${DATA_DIR}/Configuration/Invoice Ninja/.env:/var/www/app/.env
+      - /Persistent/${DATA_DIR}/Configuration/Invoice Ninja/.env:/var/www/app/.env
-      - /Rancher/${DATA_DIR}/Logo:/var/www/app/public/logo
+      - /Persistent/${DATA_DIR}/Logo:/var/www/app/public/logo
-      - /Rancher/${DATA_DIR}/Storage:/var/www/app/storage
+      - /Persistent/${DATA_DIR}/Storage:/var/www/app/storage
   cron:
     image: invoiceninja/invoiceninja:latest
     dns:
@@ -73,7 +73,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
-      - /Rancher/${DATA_DIR}/Database:/var/lib/mysql
+      - /Persistent/${DATA_DIR}/Database:/var/lib/mysql
   nginx:
     image: nginx
     dns:
@@ -103,6 +103,6 @@ services:
       - invoiceninja
     restart: on-failure
     volumes:
-      - /Rancher/${DATA_DIR}/Configuration/NGINX/nginx.conf:/etc/nginx/nginx.conf:ro
+      - /Persistent/${DATA_DIR}/Configuration/NGINX/nginx.conf:/etc/nginx/nginx.conf:ro
     volumes_from:
       - invoiceninja

templates/Jellyfin/0/docker-compose.yml

@@ -29,6 +29,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}/Cache:/cache # Cache files
+      - /Persistent/${DATA_DIR}/Cache:/cache # Cache files
-      - /RancherCattle/${DATA_DIR}/Configuration:/config # Configuration files
+      - /Persistent/${DATA_DIR}/Configuration:/config # Configuration files
-      - /RancherCattle/${DATA_DIR}/Media:/mnt/library # Media files
+      - /Persistent/${DATA_DIR}/Media:/mnt/library # Media files

templates/Joomla/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
-      - /Rancher/${DATA_DIR}/Files:/var/www/html # Joomla Public Files
+      - /Persistent/${DATA_DIR}/Files:/var/www/html # Joomla Public Files
   mysql:
     image: mysql:5
     dns: # Using Cloudflare 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
-      - /Rancher/${DATA_DIR}/Database:/var/lib/mysql # MySQL data
+      - /Persistent/${DATA_DIR}/Database:/var/lib/mysql # MySQL data

templates/Nextcloud/0/docker-compose.yml

@@ -61,10 +61,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
-      - /Rancher/${DATA_DIR}/Apps:/var/www/html/custom_apps # Nextcloud apps
+      - /Persistent/${DATA_DIR}/Apps:/var/www/html/custom_apps # Nextcloud apps
-      - /Rancher/${DATA_DIR}/Configuration:/var/www/html/config # Nextcloud configuration files
+      - /Persistent/${DATA_DIR}/Configuration:/var/www/html/config # Nextcloud configuration files
-      - /Rancher/${DATA_DIR}/Nextcloud:/var/www/html # Nextcloud site
+      - /Persistent/${DATA_DIR}/Nextcloud:/var/www/html # Nextcloud site
-      - /Rancher/${DATA_DIR}/UserData:/var/www/html/data # Users' data file
+      - /Persistent/${DATA_DIR}/UserData:/var/www/html/data # Users' data file
   mysql:
     image: mysql:5
     dns: # Using Cloudflare DNS
@@ -87,7 +87,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
-      - /Rancher/${DATA_DIR}/Database:/var/lib/mysql
+      - /Persistent/${DATA_DIR}/Database:/var/lib/mysql
   {{- if eq .Values.REDIS "true"}}
   redis:
     image: redis:alpine

templates/Nginx/0/docker-compose.yml

@@ -31,6 +31,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"}}
-      - /Rancher/${DATA_DIR}/Configuration:/etc/nginx
+      - /Persistent/${DATA_DIR}/Configuration:/etc/nginx
       {{- end}}
-      - /Rancher/${DATA_DIR}/HTML:/usr/share/nginx/html
+      - /Persistent/${DATA_DIR}/HTML:/usr/share/nginx/html

templates/OpenProject/0/docker-compose.yml

@@ -45,6 +45,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
-      - /Rancher/${DATA_DIR}/Database:/var/lib/postgresql/9.6/main
+      - /Persistent/${DATA_DIR}/Database:/var/lib/postgresql/9.6/main
-      - /Rancher/${DATA_DIR}/Logs:/var/log/supervisor
+      - /Persistent/${DATA_DIR}/Logs:/var/log/supervisor
-      - /Rancher/${DATA_DIR}/Static:/var/db/openproject
+      - /Persistent/${DATA_DIR}/Static:/var/db/openproject

templates/Pydio-Cells/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}:/root/.config/pydio/cells
+      - /Persistent/${DATA_DIR}:/root/.config/pydio/cells
   mysql:
     image: mysql:5.7
     command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci]
@@ -58,4 +58,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
+      - /Persistent/${DATA_DIR}/Database:/var/lib/mysql

templates/Redis/0/docker-compose.yml

@@ -22,7 +22,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"}}
-      - /Rancher/${DATA_DIR}/Configuration/redis.conf:/usr/local/etc/redis/redis.conf
+      - /Persistent/${DATA_DIR}/Configuration/redis.conf:/usr/local/etc/redis/redis.conf
       {{- end}}
-      - /Rancher/${DATA_DIR}/Data:/data
+      - /Persistent/${DATA_DIR}/Data:/data
       {{- end}}

templates/RocketChat/0/docker-compose.yml

@@ -53,8 +53,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
-      - /Rancher/${DATA_DIR}/Database/Data:/data/db
+      - /Persistent/${DATA_DIR}/Database/Data:/data/db
-      - /Rancher/${DATA_DIR}/Database/Dump:/dump
+      - /Persistent/${DATA_DIR}/Database/Dump:/dump
     command: mongod --smallfiles
   rocketchat:
     image: rocketchat/rocket.chat:latest

templates/Snipe-IT/0/docker-compose.yml

@@ -40,8 +40,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
-      - /Rancher/${DATA_DIR}/Application:/var/lib/snipeit
+      - /Persistent/${DATA_DIR}/Application:/var/lib/snipeit
-      - /Rancher/${DATA_DIR}/Backups:/var/www/html/storage/app/backups
+      - /Persistent/${DATA_DIR}/Backups:/var/www/html/storage/app/backups
   mysql:
     image: mysql:5
     dns:
@@ -64,4 +64,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
-      - /Rancher/${DATA_DIR}/Database:/var/lib/mysql
+      - /Persistent/${DATA_DIR}/Database:/var/lib/mysql

templates/Traefik/0/docker-compose.yml

@@ -25,6 +25,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
-      - /Rancher/${DATA_DIR}/Configuration/traefik.toml:/traefik.toml
+      - /Persistent/${DATA_DIR}/Configuration/traefik.toml:/traefik.toml
-      - /Rancher/${DATA_DIR}/LetsEncrypt/acme.json:/acme.json # For Let's Encrypt certificates
+      - /Persistent/${DATA_DIR}/LetsEncrypt/acme.json:/acme.json # For Let's Encrypt certificates
-      - /Rancher/${DATA_DIR}/Logs:/external/logs
+      - /Persistent/${DATA_DIR}/Logs:/external/logs

templates/Wiki.js-v1/0/docker-compose.yml

@@ -20,8 +20,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
-      - /Rancher/${DATA_DIR}/Database/Data:/data/db
+      - /Persistent/${DATA_DIR}/Database/Data:/data/db
-      - /Rancher/${DATA_DIR}/Database/Dump:/dump
+      - /Persistent/${DATA_DIR}/Database/Dump:/dump
   wikijs:
     image: requarks/wiki:latest # v1 Only
     dns: # Using Cloudflare 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
-      - /Rancher/${DATA_DIR}/Wiki/config.yml:/var/wiki/config.yml
+      - /Persistent/${DATA_DIR}/Wiki/config.yml:/var/wiki/config.yml

templates/WordPress/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
-      - /Rancher/${DATA_DIR}/Wordpress:/var/www/html
+      - /Persistent/${DATA_DIR}/Wordpress:/var/www/html
   mysql:
     image: mysql:5
     dns:
@@ -58,4 +58,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
-      - /Rancher/${DATA_DIR}/Database:/var/lib/mysql
+      - /Persistent/${DATA_DIR}/Database:/var/lib/mysql

templates/XWiki/0/docker-compose.yml

@@ -38,7 +38,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
-      - /Rancher/${DATA_DIR}/XWiki:/usr/local/xwiki
+      - /Persistent/${DATA_DIR}/XWiki:/usr/local/xwiki
   postgresql:
     image: postgres:alpine
     dns:
@@ -65,4 +65,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
-      - /Rancher/${DATA_DIR}/Database:/var/lib/postgresql/data
+      - /Persistent/${DATA_DIR}/Database:/var/lib/postgresql/data

templates/YOURLS/0/docker-compose.yml

@@ -58,4 +58,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
+      - /Persistent/${DATA_DIR}/Database:/var/lib/mysql

templates/sysPass/0/docker-compose.yml

@@ -31,8 +31,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
-      - /Rancher/${DATA_DIR}/Configuration:/var/www/html/sysPass/app/config # sysPass configuration files
+      - /Persistent/${DATA_DIR}/Configuration:/var/www/html/sysPass/app/config # sysPass configuration files
-      - /Rancher/${DATA_DIR}/Backups:/var/www/html/sysPass/app/backup # sysPass backups
+      - /Persistent/${DATA_DIR}/Backups:/var/www/html/sysPass/app/backup # sysPass backups
   mysql:
     image: mysql:5
     dns: # Using Cloudflare DNS
@@ -52,4 +52,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
-      - /Rancher/${DATA_DIR}/Database:/var/lib/mysql # MySQL database files
+      - /Persistent/${DATA_DIR}/Database:/var/lib/mysql # MySQL database files