HTTPS Ports (#137)

* Andre2308 tmpfs (#2)

* Update TMPFS

Now it runs without Admin Password

* Not longer Needed

* Not longer needed

* Update README.ME to new TMPF Version

* Update README.md 

* Made some modifications for TMPFS

* Updated the TMPFS and Z-Wave Installation

* Made it choiceable on Installation. #131

* Fix Sed Failure and Cleaned TMPFS script

* Add Config HTTPS Port on Install

* Add Portcheck for HTTPS

* Fix some Wizard Text

Author: andre2308

WIZARD_UIFILES/install_uifile

@@ -22,7 +22,7 @@
     "step_title": "Adminport",
     "items": [{
         "type": "textfield",
-        "desc": "Choose your HTTP port for openhab:",
+        "desc": "Choose your ports for openhab:",
         "subitems": [{
             "key": "pkgwizard_txt_port",
             "desc": "HTTP Port",
@@ -37,6 +37,20 @@
                     "errorText": "Error: HTTP Port must consist of 4 to 5 numbers."
                 }
             }
+            },{
+            "key": "pkgwizard_txt_ports",
+            "desc": "HTTPS Port",
+            "defaultValue": "8443",
+            "emptyText": "8443",
+            "validator": {
+                "allowBlank": false,
+                "minLength": 4,
+                "maxLength": 5,
+                "regex": {
+                    "expr": "/[0-9]{4,5}/i",
+                    "errorText": "Error: HTTPS Port must consist of 4 to 5 numbers."
+                }
+            }
         }]
      }]
 },{

WIZARD_UIFILES/install_uifile_ger

@@ -21,7 +21,7 @@
     "step_title": "Adminport",
     "items": [{
         "type": "textfield",
-        "desc": "Wähle den HTTP Port für Openhab aus:",
+        "desc": "Wähle die Ports für Openhab aus:",
         "subitems": [{
             "key": "pkgwizard_txt_port",
             "desc": "HTTP Port",
@@ -36,6 +36,20 @@
                     "errorText": "Error: HTTP Port muss aus 4 bis 5 Zahlen bestehen."
                 }
             }
+            },{
+            "key": "pkgwizard_txt_ports",
+            "desc": "HTTPS Port",
+            "defaultValue": "8443",
+            "emptyText": "8443",
+            "validator": {
+                "allowBlank": false,
+                "minLength": 4,
+                "maxLength": 5,
+                "regex": {
+                    "expr": "/[0-9]{4,5}/i",
+                    "errorText": "Error: HTTPS Port muss aus 4 bis 5 Zahlen bestehen."
+                }
+            }
         }]
      }]
 },{

WIZARD_UIFILES/upgrade_uifile

@@ -5,6 +5,7 @@
         "desc": "Choose your destination directory for configuration files:",
         "subitems": [{
             "key": "pkgwizard_public_std",
+
             "desc": "/public/openHAB/ <br>(must exist before installing and has to include the folders /conf and /addons and /userdata)",
             "defaultValue": true
         }, {
@@ -21,7 +22,7 @@
     "step_title": "Adminport",
     "items": [{
         "type": "textfield",
-        "desc": "Choose your HTTP port for openhab:",
+        "desc": "Choose your ports for openhab:",
         "subitems": [{
             "key": "pkgwizard_txt_port",
             "desc": "HTTP Port",
@@ -36,6 +37,20 @@
                     "errorText": "Error: HTTP Port must consist of 4 to 5 numbers."
                 }
             }
+            },{
+            "key": "pkgwizard_txt_ports",
+            "desc": "HTTPS Port",
+            "defaultValue": "8443",
+            "emptyText": "8443",
+            "validator": {
+                "allowBlank": false,
+                "minLength": 4,
+                "maxLength": 5,
+                "regex": {
+                    "expr": "/[0-9]{4,5}/i",
+                    "errorText": "Error: HTTPS Port must consist of 4 to 5 numbers."
+                }
+            }
         }]
      }]
 },{

WIZARD_UIFILES/upgrade_uifile_ger

@@ -21,7 +21,7 @@
     "step_title": "Adminport",
     "items": [{
         "type": "textfield",
-        "desc": "Wähle einen HTTP Port fü openhab:",
+        "desc": "Wähle die Ports für Openhab aus:",
         "subitems": [{
             "key": "pkgwizard_txt_port",
             "desc": "HTTP Port",
@@ -33,7 +33,21 @@
                 "maxLength": 5,
                 "regex": {
                     "expr": "/[0-9]{4,5}/i",
-                    "errorText": "Error: Der HTTP Port muss zwischen 4 und 5 Zahlen lang sein."
+                    "errorText": "Error: HTTP Port muss aus 4 bis 5 Zahlen bestehen."
+                }
+            }
+            },{
+            "key": "pkgwizard_txt_ports",
+            "desc": "HTTPS Port",
+            "defaultValue": "8443",
+            "emptyText": "8443",
+            "validator": {
+                "allowBlank": false,
+                "minLength": 4,
+                "maxLength": 5,
+                "regex": {
+                    "expr": "/[0-9]{4,5}/i",
+                    "errorText": "Error: HTTPS Port muss aus 4 bis 5 Zahlen bestehen."
                 }
             }
         }]

scripts/installer.sh

@@ -57,6 +57,16 @@ if [ ! -z "${pkgwizard_txt_port}" ]; then
   fi
 fi
 
+if [ ! -z "${pkgwizard_txt_ports}" ]; then
+  echo "  port:    ${pkgwizard_txt_ports}" >>$LOG
+  if netstat -tlpn | grep ${pkgwizard_txt_ports}; then
+    echo "  Your selected port ${pkgwizard_txt_ports} is already in use." >>$LOG
+    echo "  Please choose another one and try again." >>$LOG
+    echo " Port ${pkgwizard_txt_ports} already in use. Please try again." >> $SYNOPKG_TEMP_LOGFILE
+    exit 1
+  fi
+fi
+
 OH_FOLDERS_EXISTS=no
 OH_CONF="${OH_FOLDER}/conf"
 OH_ADDONS="${OH_FOLDER}/addons"
@@ -207,15 +217,24 @@ postinst ()
     exit 1; 
   fi
 
-  # configurate new port for openhab
+  # configurate new http port for openhab
   sed -i "s/^.*HTTP_PORT=.*$/HTTP_PORT=${pkgwizard_txt_port}/g" ${SYNOPKG_PKGDEST}/runtime/bin/setenv
   if [ $? -ne 0 ]; then
     echo "    FAILED (sed)" >>$LOG;
-    echo "    Could not change ${SYNOPKG_PKGDEST}/runtime/bin/setenv file with new port." >>$LOG;
+    echo "    Could not change ${SYNOPKG_PKGDEST}/runtime/bin/setenv file with new http port." >>$LOG;
     echo " Installation failed. See log file $LOG for more details." >> $SYNOPKG_TEMP_LOGFILE
     exit 1; 
   fi
 
+  # configurate new https port for openhab
+  sed -i "s/^.*HTTPS_PORT=.*$/HTTPS_PORT=${pkgwizard_txt_ports}/g" ${SYNOPKG_PKGDEST}/runtime/bin/setenv
+  if [ $? -ne 0 ]; then
+    echo "    FAILED (sed)" >>$LOG;
+    echo "    Could not change ${SYNOPKG_PKGDEST}/runtime/bin/setenv file with new https port." >>$LOG;
+    echo " Installation failed. See log file $LOG for more details." >> $SYNOPKG_TEMP_LOGFILE
+    exit 1; 
+  fi  
+
   # configurate TMPFS
   if [ "${pkgwizard_tmpfs}" == "true" ]; then 
     sed -i "s|^OPENHAB2_ROOT=.*$|OPENHAB2_ROOT=""${OH_FOLDER}""|g" "${SYNOPKG_PKGDEST}/openHAB-tmpfs.sh"