diff --git a/templates/Nextcloud-NFS/0/README.md b/templates/Nextcloud-NFS/0/README.md deleted file mode 100644 index 5a626c5..0000000 --- a/templates/Nextcloud-NFS/0/README.md +++ /dev/null @@ -1 +0,0 @@ -# Nextcloud \ No newline at end of file diff --git a/templates/Nextcloud-NFS/0/docker-compose.yml b/templates/Nextcloud-NFS/0/docker-compose.yml deleted file mode 100644 index e4cc4a0..0000000 --- a/templates/Nextcloud-NFS/0/docker-compose.yml +++ /dev/null @@ -1,78 +0,0 @@ -version: '2' -services: - - nextcloud: - image: nextcloud:stable-apache - depends_on: # Hopefully one day I'll upgrade to a rancher version that actually makes use of this. Here just for a future reminder. - - mysql - dns: - - 1.1.1.1 - - 1.0.0.1 - environment: - MYSQL_HOST: mysql - MYSQL_DATABASE: nextcloud - MYSQL_USER: nextcloud_user - MYSQL_PASSWORD: ${DB_USER_PASS} - NEXTCLOUD_ADMIN_USER: ${NC_ADMIN} - NEXTCLOUD_ADMIN_PASSWORD: ${NC_ADMIN_PASS} - labels: - # io.rancher.container.hostname_override: container_name - {{- if (.Values.HOST_LABEL)}} - io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} - {{- end}} - traefik.enable: true - traefik.alias: cloudtest.williammiceli.systems - traefik.frontend.rule: Host:cloudtest.williammiceli.systems - traefik.port: 9500 - traefik.acme: true - traefik.backend: Nextcloud - traefik.frontend.entryPoints: http,https - traefik.docker.network: public - networks: - - default - - nextcloud-nfs-net - - public - ports: - - "${HOST_HTTP_PORT}:80" - restart: on-failure - volumes: - - Nextcloud-Application:/var/www/html - - Nextcloud-UserData:/var/www/html/data - - mysql: - image: mysql:5 - dns: - - 1.1.1.1 - - 1.0.0.1 - environment: - MYSQL_DATABASE: nextcloud - MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} - MYSQL_USER: nextcloud_user - MYSQL_PASSWORD: ${DB_USER_PASS} - labels: - {{- if (.Values.HOST_LABEL)}} - io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} - {{- end}} - networks: - - nextcloud-nfs-net - restart: on-failure - volumes: - - Nextcloud-Database:/var/lib/mysql - -networks: - nextcloud-nfs-net: - public: - external: true -volumes: - Nextcloud-Application: - driver: rancher-nfs - driver_opts: - onRemove: retain - Nextcloud-UserData: - driver: rancher-nfs - driver_opts: - onRemove: retain - Nextcloud-Database: - driver: rancher-nfs - driver_opts: - onRemove: retain \ No newline at end of file diff --git a/templates/Nextcloud-NFS/0/rancher-compose.yml b/templates/Nextcloud-NFS/0/rancher-compose.yml deleted file mode 100644 index 09d96e3..0000000 --- a/templates/Nextcloud-NFS/0/rancher-compose.yml +++ /dev/null @@ -1,79 +0,0 @@ -version: '2' -catalog: - name: Nextcloud - 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=0000" - required: false - type: string - - - variable: HOST_HTTP_PORT - label: Port - description: | - The HTTP port to access the web interface on. - default: "9500" - required: true - type: string - - - variable: DB_ROOT_PASS - label: "MySQL Root Password" - description: | - A secure password to be used by the "root" MySQL user. - # default: - required: true - type: password - - - variable: DB_USER_PASS - label: "MySQL User Password" - description: | - A secure password to be used by the "nextcloud_user" MySQL user. - # default: - required: true - type: password - - - variable: NC_ADMIN - label: "Nextcloud Admin Username" - description: | - The username of the Nextcloud admin user. - # default: - required: true - type: string - - - variable: NC_ADMIN_PASS - label: "Nextcloud Admin Password" - description: | - A secure password for the Nextcloud admin user. - # default: - required: true - type: password - -# - variable: DATA_DIR -# label: "Data Directory" -# description: | -# The directory within the stack directory to store data -# default: "Nextcloud/Personal" -# required: true -# type: string - -services: - nextcloud: - scale: 1 -# health_check: -# port: ${HOST_HTTP_PORT} -# request_line: GET /healthcheck HTTP/1.0 -# interval: 5000 -# response_timeout: 2000 -# healthy_threshold: 2 -# unhealthy_threshold: 3 -# strategy: none - mysql: - scale: 1 \ No newline at end of file diff --git a/templates/Nextcloud-NFS/catalogIcon-nextcloud.svg b/templates/Nextcloud-NFS/catalogIcon-nextcloud.svg deleted file mode 100644 index 01cf5e8..0000000 --- a/templates/Nextcloud-NFS/catalogIcon-nextcloud.svg +++ /dev/null @@ -1 +0,0 @@ -catalogIcon-nextcloudW \ No newline at end of file diff --git a/templates/Nextcloud-NFS/config.yml b/templates/Nextcloud-NFS/config.yml deleted file mode 100644 index d778231..0000000 --- a/templates/Nextcloud-NFS/config.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Nextcloud-NFS -description: | - Status: EXPERIMENTAL -version: latest -# category: -maintainer: WilliamMiceli -# license: -# projectURL: https://github.com/ellerbrock/rancher-collection \ No newline at end of file diff --git a/templates/Nextcloud/0/docker-compose.yml b/templates/Nextcloud/0/docker-compose.yml index e7c6410..e4cc4a0 100644 --- a/templates/Nextcloud/0/docker-compose.yml +++ b/templates/Nextcloud/0/docker-compose.yml @@ -3,7 +3,7 @@ services: nextcloud: image: nextcloud:stable-apache - depends_on: + depends_on: # Hopefully one day I'll upgrade to a rancher version that actually makes use of this. Here just for a future reminder. - mysql dns: - 1.1.1.1 @@ -23,21 +23,21 @@ services: traefik.enable: true traefik.alias: cloudtest.williammiceli.systems traefik.frontend.rule: Host:cloudtest.williammiceli.systems - traefik.port: 9000 + traefik.port: 9500 traefik.acme: true traefik.backend: Nextcloud traefik.frontend.entryPoints: http,https traefik.docker.network: public networks: - default - - nextcloud-net + - nextcloud-nfs-net - public ports: - "${HOST_HTTP_PORT}:80" restart: on-failure volumes: - - /RancherStorage/Nextcloud/Application:/var/www/html - - /RancherStorage/Nextcloud/UserData:/var/www/html/data + - Nextcloud-Application:/var/www/html + - Nextcloud-UserData:/var/www/html/data mysql: image: mysql:5 @@ -54,12 +54,25 @@ services: io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} {{- end}} networks: - - nextcloud-net + - nextcloud-nfs-net restart: on-failure volumes: - - /RancherStorage/Nextcloud/Database:/var/lib/mysql + - Nextcloud-Database:/var/lib/mysql networks: - nextcloud-net: + nextcloud-nfs-net: public: - external: true \ No newline at end of file + external: true +volumes: + Nextcloud-Application: + driver: rancher-nfs + driver_opts: + onRemove: retain + Nextcloud-UserData: + driver: rancher-nfs + driver_opts: + onRemove: retain + Nextcloud-Database: + driver: rancher-nfs + driver_opts: + onRemove: retain \ No newline at end of file diff --git a/templates/Nextcloud/0/rancher-compose.yml b/templates/Nextcloud/0/rancher-compose.yml index d0294f9..09d96e3 100644 --- a/templates/Nextcloud/0/rancher-compose.yml +++ b/templates/Nextcloud/0/rancher-compose.yml @@ -20,7 +20,7 @@ catalog: label: Port description: | The HTTP port to access the web interface on. - default: "9000" + default: "9500" required: true type: string @@ -28,6 +28,7 @@ catalog: label: "MySQL Root Password" description: | A secure password to be used by the "root" MySQL user. + # default: required: true type: password @@ -35,6 +36,7 @@ catalog: label: "MySQL User Password" description: | A secure password to be used by the "nextcloud_user" MySQL user. + # default: required: true type: password @@ -42,6 +44,7 @@ catalog: label: "Nextcloud Admin Username" description: | The username of the Nextcloud admin user. + # default: required: true type: string @@ -49,9 +52,18 @@ catalog: label: "Nextcloud Admin Password" description: | A secure password for the Nextcloud admin user. + # default: required: true type: password +# - variable: DATA_DIR +# label: "Data Directory" +# description: | +# The directory within the stack directory to store data +# default: "Nextcloud/Personal" +# required: true +# type: string + services: nextcloud: scale: 1 diff --git a/templates/Nextcloud/config.yml b/templates/Nextcloud/config.yml index 3e0f8be..d778231 100644 --- a/templates/Nextcloud/config.yml +++ b/templates/Nextcloud/config.yml @@ -1,6 +1,6 @@ -name: Nextcloud +name: Nextcloud-NFS description: | - Status: Functional + Status: EXPERIMENTAL version: latest # category: maintainer: WilliamMiceli