Merge branch 'develop/snipe-it'

# Conflicts:
#	templates/Snipe-IT/0/rancher-compose.yml

templates/Snipe-IT/0/README.md

@@ -0,0 +1,7 @@
+# Snipe-IT
+
+
+### Generate Your App Key Using:
+`php artisan key:generate`
+
+https://snipe-it.readme.io/docs/generate-your-app-key

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

@@ -1,7 +1,7 @@
 version: '2'
 services:
 
-  snipe:
+  snipe-it:
     image: snipe/snipe-it:latest
     depends_on:
       - mysql
@@ -10,28 +10,25 @@ services:
       - 1.0.0.1
     environment:
       APP_ENV: production
-      APP_DEBUG: true
+      APP_DEBUG: false
-      APP_URL: ${URL}:${HOST_HTTP_PORT}
+      APP_URL: ${URL}:${WEB_PORT}
       APP_KEY: ${APP_KEY}
       MYSQL_HOST: mysql
       MYSQL_DATABASE: snipeit
       MYSQL_USER: snipe_user
       MYSQL_PASSWORD: ${DB_USER_PASS}
-      APP_ENV:
     labels:
       io.rancher.container.pull_image: always
-      {{- if (.Values.HOST_LABEL)}}
+      {{- if .Values.HOST_LABEL}}
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
       {{- end}}
-    networks:
+    links:
-      - default
+      - mysql
-      - snipe-net
     ports:
-      - "${HOST_HTTP_PORT}:80"
+      - "${WEB_PORT}:80"
-      - "${HOST_HTTPS_PORT}:443"
     restart: on-failure
     volumes:
-      - ${STORAGE_BASE_DIR}${APP_DIR}:/var/lib/snipeit
+      - /RancherCattleData/${DATA_DIR}/Application:/var/lib/snipeit
   mysql:
     image: mysql:5
     dns:
@@ -47,11 +44,6 @@ services:
       {{- if (.Values.HOST_LABEL)}}
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
       {{- end}}
-    networks:
-      - snipe-net
     restart: on-failure
     volumes:
-      - ${STORAGE_BASE_DIR}${DB_DIR}:/var/lib/mysql
+      - /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql
-
-networks:
-  snipe-net:

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

@@ -11,7 +11,7 @@ catalog:
     - variable: "HOST_LABEL"
       label: "Host Label Key/Value Pair"
       description: |
-        The Label Key/Value pair on the host which InvoiceNinja should be deployed
+        The Label Key/Value pair on the host which containers should be deployed
       default: "host.id=Host1"
       required: false
       type: string
@@ -24,43 +24,19 @@ catalog:
       required: true
       type: string
 
-    - variable: "HOST_HTTP_PORT"
+    - variable: "WEB_PORT"
-      label: "Host HTTP Port"
+      label: "Local Web Port"
       description: |
-        The HTTP port to locally access the web interface on.
+        The port to locally access the web interface on.
-      default: "12000"
+      default: "10300"
       required: true
       type: string
 
-    - variable: "HOST_HTTPS_PORT"
+    - variable: "DATA_DIR"
-      label: "Host HTTPS Port"
+      label: "Data Directory"
       description: |
-        The HTTPS port to access the web interface on.
+        The directory to store persistent data for the stack.
-      default: "12500"
+      default: "Personal/Snipe-IT"
-      required: true
-      type: string
-
-    - variable: "STORAGE_BASE_DIR"
-      label: "Base Storage Directory"
-      description: |
-        The base path of where persistent storage should be kept at.
-      default: "/RancherStorage/SnipeIT"
-      required: true
-      type: string
-
-    - variable: "APP_DIR"
-      label: "Application Directory"
-      description: |
-        The folder for persistent application files.
-      default: "/Application"
-      required: true
-      type: string
-
-    - variable: "DB_DIR"
-      label: "Database Directory"
-      description: |
-        The folder for persistent database files.
-      default: "/Database"
       required: true
       type: string
 
@@ -68,6 +44,7 @@ catalog:
       label: "MySQL Root Password"
       description: |
         A secure password to be used by the "root" MySQL user.
+      # default:
       required: true
       type: password
 
@@ -75,6 +52,7 @@ catalog:
       label: "MySQL User Password"
       description: |
         A secure password to be used by the "snipe_user" MySQL user.
+      # default:
       required: true
       type: password