merged

Merge branch 'master' of https://git.format.hu/format/proxy-scheduler

firewall-letsencrypt.json

@@ -5,7 +5,7 @@
     },
     "containers": [
         {
-			"IMAGE": "registry.format.hu/firewall",
+            "IMAGE": "safebox/firewall",
             "NAME": "firewall",
             "MEMORY": "64M",
             "NETWORK": "host",
@@ -29,17 +29,35 @@
             ],
             "PORTS": [],
             "READYNESS": [
-			        {"tcp": ""},
+                {
-			        {"HTTP": ""},
+                    "tcp": ""
-				{"EXEC": "/ready.sh"}
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
             ],
             "ENVS": [
-               			{ "CHAIN": "DOCKER-USER" },
+                {
-                                { "SOURCE": "smarthostloadbalancer" },
+                    "CHAIN": "DOCKER-USER"
-                                { "TARGET": "letsencrypt" },
+                },
-                                { "TYPE": "tcp" },
+                {
-                                { "TARGET_PORT": "80" },
+                    "SOURCE": "smarthostloadbalancer"
-                                { "COMMENT": "letsencrypt" }
+                },
+                {
+                    "TARGET": "letsencrypt"
+                },
+                {
+                    "TYPE": "tcp"
+                },
+                {
+                    "TARGET_PORT": "80"
+                },
+                {
+                    "COMMENT": "letsencrypt"
+                }
             ],
             "EXTRA": "--privileged --rm",
             "DEPEND": "null",

letsencrypt.json

@@ -14,7 +14,7 @@
     ],
     "containers": [
         {
-			"IMAGE": "registry.format.hu/letsencrypt",
+            "IMAGE": "safebox/letsencrypt",
             "NAME": "letsencrypt",
             "MEMORY": "64M",
             "IP": "172.18.254.254",
@@ -32,18 +32,28 @@
                 }
             ],
             "PORTS": [],
-			"ENV_FILES": [ "/etc/user/config/user.json" ],
+            "ENV_FILES": [
+                "/etc/user/config/user.json"
+            ],
             "READYNESS": [
-			        {"tcp": ""},
+                {
-			        {"HTTP": ""},
+                    "tcp": ""
-				{"EXEC": "/ready.sh"}
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
             ],
             "EXTRA": "",
             "DEPEND": "null",
             "START_ON_BOOT": "false",
             "CMD": "null",
             "PRE_START": "null",
-			"POST_START": [ "firewall-29eexhrh" ]
+            "POST_START": [
+                "firewall-letsencrypt"
+            ]
         }
     ]
 }

proxy-scheduler.json

@@ -5,7 +5,7 @@
     },
     "containers": [
         {
-                        "IMAGE": "registry.format.hu/proxy-scheduler:latest",
+            "IMAGE": "safebox/proxy-scheduler:latest",
             "NAME": "proxy_scheduler-ifhiwhhg",
             "MEMORY": "64M",
             "IP": "null",
@@ -49,15 +49,25 @@
             ],
             "PORTS": [],
             "READYNESS": [
-                                {"tcp": ""},
+                {
-                                {"HTTP": ""},
+                    "tcp": ""
-                                {"EXEC": "/ready.sh"}
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
             ],
-                        "ENVS": [
+            "ENVS": [],
+            "ENV_FILES": [
+                "/etc/system/config/proxy.json"
             ],
-			"ENV_FILES": [ "/etc/system/config/proxy.json" ],
             "EXTRA": "null",
-                        "DEPEND": [ "public-proxy.networks.loadbalancer", "public-proxy.containers.loadbalancer-27dhuwdh" ],
+            "DEPEND": [
+                "public-proxy.networks.loadbalancer",
+                "public-proxy.containers.loadbalancer-27dhuwdh"
+            ],
             "START_ON_BOOT": "true",
             "CMD": "null",
             "PRE_START": "null",

proxy.json

@@ -20,7 +20,7 @@
         "COMMENT": "edeg3e98"
     },
     "proxy_scheduler": {
-		"DOCKER_REGISTRY_URL": "registry.format.hu",
+        "DOCKER_REGISTRY_URL": "safebox",
         "CERT_DIR": "/keys",
         "DOMAIN_DIR": "/domains",
         "PROXY_SERVICE_FILE": "public-proxy.json",
@@ -32,7 +32,7 @@
         "SERVICE_NAME": "public-proxy"
     },
     "proxy_scheduler_local": {
-		"DOCKER_REGISTRY_URL": "registry.format.hu",
+        "DOCKER_REGISTRY_URL": "safebox",
         "PROXY_TYPE": "",
         "GENERATE_CERTIFICATE": "true",
         "LETSENCRYPT_URL": "letsencrypt.org",