MSF-409 - Refactoring.

milos85vasic · milos85vasic · commit f53c036f35da · 2021-03-01T17:44:59.000+01:00
diff --git a/certification_authority/1.0.0/Ubuntu/Ca.json b/certification_authority/1.0.0/Ubuntu/Ca.json
@@ -28,27 +28,27 @@
           },
           {
             "type": "command",
-            "value": "mkdir -p {{SERVER.SERVER_HOME}}/Server/EasyRSA"
+            "value": "mkdir -p {{SERVER.HOME}}/Server/EasyRSA"
           },
           {
             "type": "command",
-            "value": "tar -xvf EasyRSA-3.0.7.tgz -C {{SERVER.SERVER_HOME}}/Server/EasyRSA"
+            "value": "tar -xvf EasyRSA-3.0.7.tgz -C {{SERVER.HOME}}/Server/EasyRSA"
           },
           {
             "type": "command",
             "value": "rm EasyRSA-3.0.7.tgz"
           },
           {
             "type": "command",
-            "value": "chmod -R 700 {{SERVER.SERVER_HOME}}/Server/EasyRSA"
+            "value": "chmod -R 700 {{SERVER.HOME}}/Server/EasyRSA"
           },
           {
             "type": "command",
             "value": "mkdir -p {{SERVER.CERTIFICATION.HOME}}"
           },
           {
             "type": "command",
-            "value": "ln -s {{SERVER.SERVER_HOME}}/Server/EasyRSA/EasyRSA-3.0.7/* {{SERVER.CERTIFICATION.HOME}}"
+            "value": "ln -s {{SERVER.HOME}}/Server/EasyRSA/EasyRSA-3.0.7/* {{SERVER.CERTIFICATION.HOME}}"
           },
           {
             "type": "deploy",
diff --git a/docker/1.0.0/Centos/Compose.json b/docker/1.0.0/Centos/Compose.json
@@ -23,11 +23,11 @@
           },
           {
             "type": "command",
-            "value": "curl -L \"https://github.com/docker/compose/releases/download/{{DOCKER.DOCKER_COMPOSE_VERSION}}/docker-compose-$(uname -s)-$(uname -m)\" -o {{DOCKER.DOCKER_COMPOSE_PATH}}/docker-compose"
+            "value": "curl -L \"https://github.com/docker/compose/releases/download/{{DOCKER.COMPOSE_VERSION}}/docker-compose-$(uname -s)-$(uname -m)\" -o {{DOCKER.COMPOSE_PATH}}/docker-compose"
           },
           {
             "type": "command",
-            "value": "chmod +x {{DOCKER.DOCKER_COMPOSE_PATH}}/docker-compose"
+            "value": "chmod +x {{DOCKER.COMPOSE_PATH}}/docker-compose"
           },
           {
             "type": "command",
@@ -53,11 +53,11 @@
           },
           {
             "type": "command",
-            "value": "curl -L \"https://github.com/docker/compose/releases/download/{{DOCKER.DOCKER_COMPOSE_VERSION}}/docker-compose-$(uname -s)-$(uname -m)\" -o {{DOCKER.DOCKER_COMPOSE_PATH}}/docker-compose"
+            "value": "curl -L \"https://github.com/docker/compose/releases/download/{{DOCKER.COMPOSE_VERSION}}/docker-compose-$(uname -s)-$(uname -m)\" -o {{DOCKER.COMPOSE_PATH}}/docker-compose"
           },
           {
             "type": "command",
-            "value": "chmod +x {{DOCKER.DOCKER_COMPOSE_PATH}}/docker-compose"
+            "value": "chmod +x {{DOCKER.COMPOSE_PATH}}/docker-compose"
           },
           {
             "type": "command",
diff --git a/docker/1.0.0/Centos/Docker.json b/docker/1.0.0/Centos/Docker.json
@@ -27,7 +27,7 @@
           },
           {
             "type": "command",
-            "value": "sh {{SERVER.SERVER_HOME}}/Utils/setenforce.sh"
+            "value": "sh {{SERVER.HOME}}/Utils/setenforce.sh"
           },
           {
             "type": "packagesErase",
diff --git a/docker/1.0.0/Definition.json b/docker/1.0.0/Definition.json
@@ -7,9 +7,9 @@
   },
   "variables": {
     "DOCKER": {
-      "DOCKER_HOME": "{{SERVER.SERVER_HOME}}/Docker",
-      "DOCKER_COMPOSE_PATH": "/usr/local/bin",
-      "DOCKER_COMPOSE_VERSION": "1.27.4"
+      "HOME": "{{SERVER.HOME}}/Docker",
+      "COMPOSE_PATH": "/usr/local/bin",
+      "COMPOSE_VERSION": "1.28.4"
     }
   },
   "includes": [
diff --git a/docker/1.0.0/Fedora/Compose.json b/docker/1.0.0/Fedora/Compose.json
@@ -23,11 +23,11 @@
           },
           {
             "type": "command",
-            "value": "curl -L \"https://github.com/docker/compose/releases/download/{{DOCKER.DOCKER_COMPOSE_VERSION}}/docker-compose-$(uname -s)-$(uname -m)\" -o {{DOCKER.DOCKER_COMPOSE_PATH}}/docker-compose"
+            "value": "curl -L \"https://github.com/docker/compose/releases/download/{{DOCKER.COMPOSE_VERSION}}/docker-compose-$(uname -s)-$(uname -m)\" -o {{DOCKER.COMPOSE_PATH}}/docker-compose"
           },
           {
             "type": "command",
-            "value": "chmod +x {{DOCKER.DOCKER_COMPOSE_PATH}}/docker-compose"
+            "value": "chmod +x {{DOCKER.COMPOSE_PATH}}/docker-compose"
           },
           {
             "type": "command",
diff --git a/docker/1.0.0/Fedora/Docker.json b/docker/1.0.0/Fedora/Docker.json
@@ -19,7 +19,7 @@
           },
           {
             "type": "command",
-            "value": "sh {{SERVER.SERVER_HOME}}/Utils/setenforce.sh"
+            "value": "sh {{SERVER.HOME}}/Utils/setenforce.sh"
           },
           {
             "type": "packagesErase",
@@ -89,7 +89,7 @@
           },
           {
             "type": "command",
-            "value": "sh {{SERVER.SERVER_HOME}}/Utils/setenforce.sh"
+            "value": "sh {{SERVER.HOME}}/Utils/setenforce.sh"
           },
           {
             "type": "packagesErase",
@@ -163,7 +163,7 @@
           },
           {
             "type": "command",
-            "value": "sh {{SERVER.SERVER_HOME}}/Utils/setenforce.sh"
+            "value": "sh {{SERVER.HOME}}/Utils/setenforce.sh"
           },
           {
             "type": "packagesErase",
diff --git a/docker/1.0.0/Ubuntu/Compose.json b/docker/1.0.0/Ubuntu/Compose.json
@@ -35,11 +35,11 @@
           },
           {
             "type": "command",
-            "value": "curl -L \"https://github.com/docker/compose/releases/download/{{DOCKER.DOCKER_COMPOSE_VERSION}}/docker-compose-$(uname -s)-$(uname -m)\" -o {{DOCKER.DOCKER_COMPOSE_PATH}}/docker-compose"
+            "value": "curl -L \"https://github.com/docker/compose/releases/download/{{DOCKER.COMPOSE_VERSION}}/docker-compose-$(uname -s)-$(uname -m)\" -o {{DOCKER.COMPOSE_PATH}}/docker-compose"
           },
           {
             "type": "command",
-            "value": "chmod +x {{DOCKER.DOCKER_COMPOSE_PATH}}/docker-compose"
+            "value": "chmod +x {{DOCKER.COMPOSE_PATH}}/docker-compose"
           },
           {
             "type": "command",

Original file line number	Diff line number	Diff line change
`@@ -28,27 +28,27 @@`
`28`	`28`	`},`
`29`	`29`	`{`
`30`	`30`	`"type": "command",`
`31`		`- "value": "mkdir -p {{SERVER.SERVER_HOME}}/Server/EasyRSA"`
	`31`	`+ "value": "mkdir -p {{SERVER.HOME}}/Server/EasyRSA"`
`32`	`32`	`},`
`33`	`33`	`{`
`34`	`34`	`"type": "command",`
`35`		`- "value": "tar -xvf EasyRSA-3.0.7.tgz -C {{SERVER.SERVER_HOME}}/Server/EasyRSA"`
	`35`	`+ "value": "tar -xvf EasyRSA-3.0.7.tgz -C {{SERVER.HOME}}/Server/EasyRSA"`
`36`	`36`	`},`
`37`	`37`	`{`
`38`	`38`	`"type": "command",`
`39`	`39`	`"value": "rm EasyRSA-3.0.7.tgz"`
`40`	`40`	`},`
`41`	`41`	`{`
`42`	`42`	`"type": "command",`
`43`		`- "value": "chmod -R 700 {{SERVER.SERVER_HOME}}/Server/EasyRSA"`
	`43`	`+ "value": "chmod -R 700 {{SERVER.HOME}}/Server/EasyRSA"`
`44`	`44`	`},`
`45`	`45`	`{`
`46`	`46`	`"type": "command",`
`47`	`47`	`"value": "mkdir -p {{SERVER.CERTIFICATION.HOME}}"`
`48`	`48`	`},`
`49`	`49`	`{`
`50`	`50`	`"type": "command",`
`51`		`- "value": "ln -s {{SERVER.SERVER_HOME}}/Server/EasyRSA/EasyRSA-3.0.7/* {{SERVER.CERTIFICATION.HOME}}"`
	`51`	`+ "value": "ln -s {{SERVER.HOME}}/Server/EasyRSA/EasyRSA-3.0.7/* {{SERVER.CERTIFICATION.HOME}}"`
`52`	`52`	`},`
`53`	`53`	`{`
`54`	`54`	`"type": "deploy",`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,11 @@`
`23`	`23`	`},`
`24`	`24`	`{`
`25`	`25`	`"type": "command",`
`26`		`- "value": "curl -L \"https://github.com/docker/compose/releases/download/{{DOCKER.DOCKER_COMPOSE_VERSION}}/docker-compose-$(uname -s)-$(uname -m)\" -o {{DOCKER.DOCKER_COMPOSE_PATH}}/docker-compose"`
	`26`	`+ "value": "curl -L \"https://github.com/docker/compose/releases/download/{{DOCKER.COMPOSE_VERSION}}/docker-compose-$(uname -s)-$(uname -m)\" -o {{DOCKER.COMPOSE_PATH}}/docker-compose"`
`27`	`27`	`},`
`28`	`28`	`{`
`29`	`29`	`"type": "command",`
`30`		`- "value": "chmod +x {{DOCKER.DOCKER_COMPOSE_PATH}}/docker-compose"`
	`30`	`+ "value": "chmod +x {{DOCKER.COMPOSE_PATH}}/docker-compose"`
`31`	`31`	`},`
`32`	`32`	`{`
`33`	`33`	`"type": "command",`
`@@ -53,11 +53,11 @@`
`53`	`53`	`},`
`54`	`54`	`{`
`55`	`55`	`"type": "command",`
`56`		`- "value": "curl -L \"https://github.com/docker/compose/releases/download/{{DOCKER.DOCKER_COMPOSE_VERSION}}/docker-compose-$(uname -s)-$(uname -m)\" -o {{DOCKER.DOCKER_COMPOSE_PATH}}/docker-compose"`
	`56`	`+ "value": "curl -L \"https://github.com/docker/compose/releases/download/{{DOCKER.COMPOSE_VERSION}}/docker-compose-$(uname -s)-$(uname -m)\" -o {{DOCKER.COMPOSE_PATH}}/docker-compose"`
`57`	`57`	`},`
`58`	`58`	`{`
`59`	`59`	`"type": "command",`
`60`		`- "value": "chmod +x {{DOCKER.DOCKER_COMPOSE_PATH}}/docker-compose"`
	`60`	`+ "value": "chmod +x {{DOCKER.COMPOSE_PATH}}/docker-compose"`
`61`	`61`	`},`
`62`	`62`	`{`
`63`	`63`	`"type": "command",`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`},`
`28`	`28`	`{`
`29`	`29`	`"type": "command",`
`30`		`- "value": "sh {{SERVER.SERVER_HOME}}/Utils/setenforce.sh"`
	`30`	`+ "value": "sh {{SERVER.HOME}}/Utils/setenforce.sh"`
`31`	`31`	`},`
`32`	`32`	`{`
`33`	`33`	`"type": "packagesErase",`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`},`
`20`	`20`	`{`
`21`	`21`	`"type": "command",`
`22`		`- "value": "sh {{SERVER.SERVER_HOME}}/Utils/setenforce.sh"`
	`22`	`+ "value": "sh {{SERVER.HOME}}/Utils/setenforce.sh"`
`23`	`23`	`},`
`24`	`24`	`{`
`25`	`25`	`"type": "packagesErase",`
`@@ -89,7 +89,7 @@`
`89`	`89`	`},`
`90`	`90`	`{`
`91`	`91`	`"type": "command",`
`92`		`- "value": "sh {{SERVER.SERVER_HOME}}/Utils/setenforce.sh"`
	`92`	`+ "value": "sh {{SERVER.HOME}}/Utils/setenforce.sh"`
`93`	`93`	`},`
`94`	`94`	`{`
`95`	`95`	`"type": "packagesErase",`
`@@ -163,7 +163,7 @@`
`163`	`163`	`},`
`164`	`164`	`{`
`165`	`165`	`"type": "command",`
`166`		`- "value": "sh {{SERVER.SERVER_HOME}}/Utils/setenforce.sh"`
	`166`	`+ "value": "sh {{SERVER.HOME}}/Utils/setenforce.sh"`
`167`	`167`	`},`
`168`	`168`	`{`
`169`	`169`	`"type": "packagesErase",`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,11 @@`
`35`	`35`	`},`
`36`	`36`	`{`
`37`	`37`	`"type": "command",`
`38`		`- "value": "curl -L \"https://github.com/docker/compose/releases/download/{{DOCKER.DOCKER_COMPOSE_VERSION}}/docker-compose-$(uname -s)-$(uname -m)\" -o {{DOCKER.DOCKER_COMPOSE_PATH}}/docker-compose"`
	`38`	`+ "value": "curl -L \"https://github.com/docker/compose/releases/download/{{DOCKER.COMPOSE_VERSION}}/docker-compose-$(uname -s)-$(uname -m)\" -o {{DOCKER.COMPOSE_PATH}}/docker-compose"`
`39`	`39`	`},`
`40`	`40`	`{`
`41`	`41`	`"type": "command",`
`42`		`- "value": "chmod +x {{DOCKER.DOCKER_COMPOSE_PATH}}/docker-compose"`
	`42`	`+ "value": "chmod +x {{DOCKER.COMPOSE_PATH}}/docker-compose"`
`43`	`43`	`},`
`44`	`44`	`{`
`45`	`45`	`"type": "command",`