diff --git a/templates/Snipe-IT/0/README.md b/templates/Snipe-IT/0/README.md index 50931e0..b575cf8 100644 --- a/templates/Snipe-IT/0/README.md +++ b/templates/Snipe-IT/0/README.md @@ -4,4 +4,8 @@ ### Generate Your App Key Using: `php artisan key:generate` -https://snipe-it.readme.io/docs/generate-your-app-key \ No newline at end of file +https://snipe-it.readme.io/docs/generate-your-app-key + + +### After upgrading to a later version, use: +`php artisan migrate` \ No newline at end of file diff --git a/templates/Snipe-IT/0/docker-compose.yml b/templates/Snipe-IT/0/docker-compose.yml index 91a856b..abae525 100644 --- a/templates/Snipe-IT/0/docker-compose.yml +++ b/templates/Snipe-IT/0/docker-compose.yml @@ -9,17 +9,17 @@ services: - 1.1.1.1 - 1.0.0.1 environment: - APP_ENV: production + APP_ENV: production # "development" or "production" APP_DEBUG: false {{- if .Values.TRAEFIK_HOST}} - APP_URL: https://${TRAEFIK_HOST} + APP_URL: https://${TRAEFIK_HOST} # No port number needed {{- else}} APP_URL: http://localhost {{- end}} APP_KEY: ${APP_KEY} MYSQL_HOST: mysql - MYSQL_DATABASE: snipeit - MYSQL_USER: snipe_user + MYSQL_DATABASE: snipeit_db + MYSQL_USER: snipeit_user MYSQL_PASSWORD: ${DB_USER_PASS} labels: io.rancher.container.pull_image: always @@ -28,14 +28,15 @@ services: {{- end}} {{- if .Values.TRAEFIK_HOST}} traefik.enable: true - traefik.frontend.rule: Host:${TRAEFIK_HOST} - traefik.frontend.entryPoints: http,https - traefik.frontend.headers.forceSTSHeader: true - traefik.frontend.headers.SSLRedirect: true - traefik.frontend.headers.STSPreload: true - traefik.frontend.headers.SSLProxyHeaders: X-Forwarded-Proto:https - traefik.frontend.headers.STSSeconds: 15552000 - traefik.port: "80" + ### Start Web Segment + traefik.web.frontend.entryPoints: http,https + traefik.web.frontend.headers.forceSTSHeader: true + 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 {{- else}} traefik.enable: false {{- end}} @@ -43,7 +44,7 @@ services: - mysql networks: - public-proxy - {{- if .Values.WEB_PORT}} + {{- if .Values.WEB_PORT}} # Allows for local access to be disabled ports: - "${WEB_PORT}:80" {{- else}} @@ -62,15 +63,19 @@ services: - 1.1.1.1 - 1.0.0.1 environment: - MYSQL_DATABASE: snipeit + MYSQL_DATABASE: snipeit_db MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} - MYSQL_USER: snipe_user + MYSQL_USER: snipeit_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}} + networks: + db-admin: + aliases: + - snipe-it # This should allow access from "mysql.snipe-it.rancher.internal" restart: on-failure volumes: - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system @@ -78,5 +83,7 @@ services: - /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql networks: + db-admin: + external: true public-proxy: external: true \ No newline at end of file diff --git a/templates/Snipe-IT/0/rancher-compose.yml b/templates/Snipe-IT/0/rancher-compose.yml index 05a87e5..9b8ec41 100644 --- a/templates/Snipe-IT/0/rancher-compose.yml +++ b/templates/Snipe-IT/0/rancher-compose.yml @@ -53,7 +53,7 @@ catalog: - variable: "DB_USER_PASS" label: "MySQL User Password" description: | - A secure password to be used by the "snipe_user" MySQL user. + A secure password to be used by the "snipeit_user" MySQL user. # default: required: true type: password @@ -61,6 +61,6 @@ catalog: - variable: "APP_KEY" label: "Encryption Key" description: | - A random 32-Character string which will be used for encryption. + See README. required: true type: password \ No newline at end of file