Merge 213e1d7b0f0981e68e4181b7c209a984b710eb6e into c9c4c2825388ef116ba82b3e02f84d2d7e16929c

helpers.go

@@ -288,6 +288,17 @@ func extractFromArchive(archive, path string) error {
 				log.Fatalf("extractFromArchive: Mkdir() failed: %s", err.Error())
 			}
 		case tar.TypeReg:
+			s := strings.Split(header.Name, "/")
+			dir := ""
+
+			for len(s) > 1 {
+				dir, s = dir+"/"+s[0], s[1:]
+				if _, err := os.Stat(path + dir); os.IsNotExist(err) {
+					if err := os.Mkdir(path+dir, 0755); err != nil {
+						log.Fatalf("extractFromArchive: Mkdir() subdir failed: %s", err.Error())
+					}
+				}
+			}
 			outFile, err := os.Create(path + "/" + header.Name)
 			if err != nil {
 				log.Fatalf("extractFromArchive: Create() failed: %s", err.Error())

main.go

@@ -534,6 +534,11 @@ func main() {
 		ovpnAdmin.mgmtInterfaces[parts[0]] = parts[len(parts)-1]
 	}
 
+	if ovpnAdmin.role == "slave" {
+		ovpnAdmin.syncDataFromMaster()
+		go ovpnAdmin.syncWithMaster()
+	}
+
 	ovpnAdmin.mgmtSetTimeFormat()
 
 	ovpnAdmin.registerMetrics()
@@ -561,11 +566,6 @@ func main() {
 		ovpnAdmin.modules = append(ovpnAdmin.modules, "ccd")
 	}
 
-	if ovpnAdmin.role == "slave" {
-		ovpnAdmin.syncDataFromMaster()
-		go ovpnAdmin.syncWithMaster()
-	}
-
 	ovpnAdmin.templates = packr.New("template", "./templates")
 
 	staticBox := packr.New("static", "./frontend/static")

setup/configure.sh

@@ -15,7 +15,7 @@ if [ -e "$SERVER_CERT" ]; then
 else
   if [ ${OVPN_ROLE:-"master"} = "slave" ]; then
     echo "Waiting for initial sync data from master"
-    while [ $(wget -q localhost/api/sync/last/try -O - | wc -m) -lt 1 ]
+    while [ $(wget -q localhost:${OVPN_LISTEN_PORT:-8080}/api/sync/last/try -O - | wc -m) -lt 1 ]
     do
       sleep 5
     done