Fixed list of environment variables

MichaelSchmidle · Jan 13, 2020 · f628e1b · f628e1b
1 parent a961a3d
commit f628e1b
Show file tree

Hide file tree

Showing 2 changed files with 108 additions and 108 deletions.
diff --git a/catalogue.json b/catalogue.json
@@ -218,107 +218,6 @@
         "name": "know",
         "platform": "linux"
     },
-    {
-        "type": 3,
-        "title": "safe",
-        "description": "Password manager based on Passit",
-        "repository": {
-            "stackfile": "composition/safe/docker-compose.yml",
-            "url": "https://github.com/MichaelSchmidle/wapps"
-        },
-        "env": [
-            {
-                "description": "The DNS hostname pointing to this app",
-                "label": "Host",
-                "name": "HOST"
-            },
-            {
-                "default": "wapps_safe",
-                "description": "The name of the database",
-                "label": "Database",
-                "name": "POSTGRES_DB"
-            },
-            {
-                "default": "wapps_safe",
-                "description": "The name of the database user",
-                "label": "Database user",
-                "name": "POSTGRES_USER"
-            },
-            {
-                "default": "wapps_safe",
-                "description": "The password of the database user",
-                "label": "Database password",
-                "name": "POSTGRES_PASSWORD"
-            },
-            {
-                "description": "Random string required by the wapp, recommended minimum length: 50 characters",
-                "label": "Secret key",
-                "name": "SECRET_KEY"
-            },
-            {
-                "description": "Email protocol to use for sending out emails from the wapp",
-                "label": "Email protocol",
-                "name": "EMAIL_PROTOCOL",
-                "select": [
-                    {
-                        "text": "SMTP",
-                        "value": "smtp"
-                    },
-                    {
-                        "text": "SMTP+SSL",
-                        "value": "smtp+ssl"
-                    },
-                    {
-                        "text": "SMTP+TLS",
-                        "value": "smtp+tls"
-                    },
-                    {
-                        "text": "Console mail",
-                        "value": "consolemail"
-                    },
-                    {
-                        "text": "File mail",
-                        "value": "filemail"
-                    },
-                    {
-                        "text": "LocMem mail",
-                        "value": "memorymail"
-                    },
-                    {
-                        "text": "Dummy mail",
-                        "value": "dummymail"
-                    }
-                ]
-            },
-            {
-                "description": "The email user account to send emails from",
-                "label": "Email user",
-                "name": "EMAIL_USER"
-            },
-            {
-                "description": "The email user password",
-                "label": "Email password",
-                "name": "EMAIL_PASSWORD"
-            },
-            {
-                "description": "The email server to send emails from",
-                "label": "Email host",
-                "name": "EMAIL_HOST"
-            },
-            {
-                "description": "The email server port to connect to",
-                "label": "Port of email host",
-                "name": "EMAIL_PORT"
-            },
-            {
-                "description": "Sender address to be used in the from field",
-                "label": "Email sender address",
-                "name": "EMAIL_SENDER"
-            }
-        ],
-        "name": "safe",
-        "platform": "linux"
-},
     {
         "type": 3,
         "title": "pvrm",
@@ -423,6 +322,107 @@
         "name": "pvrs",
         "platform": "linux"
     },
+    {
+        "type": 3,
+        "title": "safe",
+        "description": "Password manager based on Passit",
+        "repository": {
+            "stackfile": "composition/safe/docker-compose.yml",
+            "url": "https://github.com/MichaelSchmidle/wapps"
+        },
+        "env": [
+            {
+                "description": "The DNS hostname pointing to this app",
+                "label": "Host",
+                "name": "HOST"
+            },
+            {
+                "default": "wapps_safe",
+                "description": "The name of the database",
+                "label": "Database",
+                "name": "POSTGRES_DB"
+            },
+            {
+                "default": "wapps_safe",
+                "description": "The name of the database user",
+                "label": "Database user",
+                "name": "POSTGRES_USER"
+            },
+            {
+                "default": "wapps_safe",
+                "description": "The password of the database user",
+                "label": "Database password",
+                "name": "POSTGRES_PASSWORD"
+            },
+            {
+                "description": "Random string required by the wapp, recommended minimum length: 50 characters",
+                "label": "Secret key",
+                "name": "SECRET_KEY"
+            },
+            {
+                "description": "Email protocol to use for sending out emails from the wapp",
+                "label": "Email protocol",
+                "name": "EMAIL_PROTOCOL",
+                "select": [
+                    {
+                        "text": "SMTP",
+                        "value": "smtp"
+                    },
+                    {
+                        "text": "SMTP+SSL",
+                        "value": "smtp+ssl"
+                    },
+                    {
+                        "text": "SMTP+TLS",
+                        "value": "smtp+tls"
+                    },
+                    {
+                        "text": "Console mail",
+                        "value": "consolemail"
+                    },
+                    {
+                        "text": "File mail",
+                        "value": "filemail"
+                    },
+                    {
+                        "text": "LocMem mail",
+                        "value": "memorymail"
+                    },
+                    {
+                        "text": "Dummy mail",
+                        "value": "dummymail"
+                    }
+                ]
+            },
+            {
+                "description": "The email user account to send emails from",
+                "label": "Email user",
+                "name": "EMAIL_USER"
+            },
+            {
+                "description": "The email user password",
+                "label": "Email password",
+                "name": "EMAIL_PASSWORD"
+            },
+            {
+                "description": "The email server to send emails from",
+                "label": "Email host",
+                "name": "EMAIL_HOST"
+            },
+            {
+                "description": "The email server port to connect to",
+                "label": "Port of email host",
+                "name": "EMAIL_PORT"
+            },
+            {
+                "description": "Sender address to be used in the from field",
+                "label": "Email sender address",
+                "name": "EMAIL_SENDER"
+            }
+        ],
+        "name": "safe",
+        "platform": "linux"
+    },
     {
         "type": 3,
         "title": "sss",

diff --git a/composition/safe/docker-compose.yml b/composition/safe/docker-compose.yml
@@ -5,14 +5,14 @@ networks:
       name: "wapps"
 services:
   passit:
-    command: bin/start.sh
+    command: "bin/start.sh"
     environment:
-        "DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres-1a1dc91c907325c69271ddf0c944bc72:5432/${POSTGRES_DB}"
-        "SECRET_KEY=${SECRET_KEY}"
-        "IS_DEBUG=false"
-        "EMAIL_URL=${EMAIL_PROTOCOL}://${EMAIL_USER}:${EMAIL_PASSWORD}@${EMAIL_HOST}:${EMAIL_PORT}"
-        "DEFAULT_FROM_EMAIL=${EMAIL_SENDER}"
-        "EMAIL_CONFIRMATION_HOST=https://${HOST}"  
+      - "DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres-1a1dc91c907325c69271ddf0c944bc72:5432/${POSTGRES_DB}"
+      - "SECRET_KEY=${SECRET_KEY}"
+      - "IS_DEBUG=false"
+      - "EMAIL_URL=${EMAIL_PROTOCOL}://${EMAIL_USER}:${EMAIL_PASSWORD}@${EMAIL_HOST}:${EMAIL_PORT}"
+      - "DEFAULT_FROM_EMAIL=${EMAIL_SENDER}"
+      - "EMAIL_CONFIRMATION_HOST=https://${HOST}"  
     image: passit/passit
     labels:
       - "com.centurylinklabs.watchtower.enable=true"