v3.4.4.2

Now with https!

README.md

@@ -40,7 +40,7 @@ Began to lead a [Twitter](https://twitter.com/haproxy_wi), subscribe! I will wri
 24. Web application firewall
 25. LDAP support
 26. Keep active HAProxy service
-27. Ability to hide parts of the config with tags for users with "guest" role:  "HideBlockStart" and "HideBlockEnd"! 
+27. Ability to hide parts of the config with tags for users with "guest" role:  "HideBlockStart" and "HideBlockEnd"
 
 ![alt text](image/haproxy-wi-metrics.jpeg "Merics")
 
@@ -69,6 +69,10 @@ For Apache do virtualhost with cgi-bin. Like this:
 ```
 # vi /etc/httpd/conf.d/haproxy-wi.conf 
 <VirtualHost *:8080>
+        SSLEngine on
+        SSLCertificateFile /var/www/haproxy-wi/app/certs/haproxy-wi.crt
+        SSLCertificateKeyFile /var/www/haproxy-wi/app/certs/haproxy-wi.key
+
         ServerName haproxy-wi
         ErrorLog /var/log/httpd/haproxy-wi.error.log
         CustomLog /var/log/httpd/haproxy-wi.access.log combined
@@ -120,7 +124,7 @@ MariaDB [(none)]> grant all on haproxywi.* to 'haproxy-wi'@'localhost' IDENTIFIE
 Edit $HOME_HAPROXY-WI/app/haproxy-wi.cfg with your env
 ```
 
-Login http://haproxy-wi-server/users.py, and add: users, groups and servers. Default: admin/admin
+Login https://haproxy-wi-server/users.py, and add: users, groups and servers. Default: admin/admin
 
 ![alt text](image/haproxy-wi-admin-area.jpeg "Admin area")
 

app/certs/haproxy-wi.crt

@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICqjCCAhOgAwIBAgIJAPy+gzI9mIf9MA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNV
+BAYTAktaMQswCQYDVQQIDAJYWDELMAkGA1UEBwwCWFgxDzANBgNVBAoMBkFsbWF0
+eTEPMA0GA1UECwwGQWxtYXR5MSIwIAYJKoZIhvcNAQkBFhNidWZmb29uMjAwMUBt
+YWlsLnJ1MCAXDTE5MDUxODA3NTk0NVoYDzIxMTkwNDI0MDc1OTQ1WjBtMQswCQYD
+VQQGEwJLWjELMAkGA1UECAwCWFgxCzAJBgNVBAcMAlhYMQ8wDQYDVQQKDAZBbG1h
+dHkxDzANBgNVBAsMBkFsbWF0eTEiMCAGCSqGSIb3DQEJARYTYnVmZm9vbjIwMDFA
+bWFpbC5ydTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2O8JchDXR2N/8L3n
+MmI8lpJUZDi+AwKyE83gmOHAgwHdLV1KX6bS5rfvffjlMf173jhTS0XHfYpGjQwe
+0pJHAH2xDomWpHMqWSpzlf8rgsS9nK952w57CVhdeVXS6gXt0StIqH8oSaI/uBxh
+qF5RIa8Z6iDNhQHzyh+l+fzDk6kCAwEAAaNQME4wHQYDVR0OBBYEFGjClJKi8dqc
+teN1VLnqFi/mM+xjMB8GA1UdIwQYMBaAFGjClJKi8dqcteN1VLnqFi/mM+xjMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADgYEARTRZ8WCF1FwHydluOJ21P7Qe
+Oo9GaJULFayTiW5HKrUnS7dtaUyr6siveEUlwUXhyBd9hOElzjs2Lg3ZIAnMeRkJ
+FZNjsxWmAHw2SJ+/CPlIFt43OWnnXWSspfmoX9PpRqQVr2p0XYmtEADrK16jhnY6
+vJS20ou61y4+FD2Zcm0=
+-----END CERTIFICATE-----

app/certs/haproxy-wi.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDY7wlyENdHY3/wvecyYjyWklRkOL4DArITzeCY4cCDAd0tXUpf
+ptLmt+99+OUx/XveOFNLRcd9ikaNDB7SkkcAfbEOiZakcypZKnOV/yuCxL2cr3nb
+DnsJWF15VdLqBe3RK0iofyhJoj+4HGGoXlEhrxnqIM2FAfPKH6X5/MOTqQIDAQAB
+AoGBAKTZcSoXFiEPwYemJ+ynrjcV17+ZRvturvhRuN00oGBtqC/y9rOdSCM/n2Tx
+IOpOIDUMRG+tBR2nWFmS3lFSC1Uz6S1LB4oInfKEvbCpqcsFks71SSML+nx+ApyQ
+Lfnsf0zGONCPswR3KbuT8vvSk5aU2PFPjvX4NlDi9cWDua0hAkEA8Ys8hfb/ZzWY
+7F2R3vp++k+PHyk157ECgWQ0MnN7XirvMEfCJ+pqoT//ObrQx3aV7TrKCVOZo4dg
+LXHCiAYGRQJBAOXqvb/zofYxH6zBvOeAU7S6alYdjFvm11R8OQtDAWuaPzAYYHu4
+Rbz1zCnP2mNMiFJBn8FIB5AT7rHC1qfJ0BUCQBHz3li6pfr+0dHnlnrzNVLXbPTM
+9FO3JU+GqhaB3M5/9G0rODQNSUWY4xhgWToqBzStpOySiR3NZwmZpfLEN90CQHq8
+Agk7HKWY+ai2T4phdc3Pib5ozamtpBtkqOr7HQH8+GhLSw4gg5HowNE9NP63Nzp5
+77c1JVxjV5OrR/2P/TUCQQDCh9a860B9IcRhxNuztpkrnkva/HVKTDkfd6k3Nbnt
+/xvGFd0S55fHTMTg4dIBBEXv0f99IZKmH1zjRMQkkyW8
+-----END RSA PRIVATE KEY-----

app/templates/base.html

@@ -115,7 +115,7 @@
 					</ul>
 				</nav>
 				<div class="copyright-menu">
-					<a href="https://github.com/aidaho12/haproxy-wi/" title="Github repo" target="_blank" style="color: #fff">HAproxy-WI v3.4.4.1</a>
+					<a href="https://github.com/aidaho12/haproxy-wi/" title="Github repo" target="_blank" style="color: #fff">HAproxy-WI v3.4.4.2</a>
 					<br>
 					<a href="https://www.patreon.com/haproxy_wi" title="Donate" target="_blank" style="color: #fff; margin-left: 30px; color: red;" class="patreon">  Patreon</a>
 				</div>

install.sh

@@ -40,7 +40,7 @@ echo ""
 echo "################################"
 
 if hash apt-get 2>/dev/null; then
-	apt-get install git  net-tools lshw dos2unix apache2 gcc netcat python3.5  python3-pip g++ freetype2-demos libatlas-base-dev openldap-dev libpq-dev python-dev libxml2-dev libxslt1-dev libldap2-dev libsasl2-dev libffi-dev python3-dev libssl-dev -y
+	apt-get install git  net-tools lshw dos2unix apache2 gcc netcat python3.5 mod_ssl python3-pip g++ freetype2-demos libatlas-base-dev openldap-dev libpq-dev python-dev libxml2-dev libxslt1-dev libldap2-dev libsasl2-dev libffi-dev python3-dev libssl-dev -y
 	HTTPD_CONFIG="/etc/apache2/apache2.conf"
 	HAPROXY_WI_VHOST_CONF="/etc/apache2/sites-enabled/haproxy-wi.conf"
 	HTTPD_NAME="apache2"
@@ -57,7 +57,7 @@ else
         yum -y install epel-release
 	fi
 	yum -y install https://centos7.iuscommunity.org/ius-release.rpm 
-	yum -y install git nmap-ncat net-tools python35u dos2unix python35u-pip httpd python35u-devel gcc-c++ openldap-devel python-devel python-jinja2 nodejs
+	yum -y install git nmap-ncat net-tools python35u dos2unix python35u-pip mod_ssl httpd python35u-devel gcc-c++ openldap-devel python-devel python-jinja2 nodejs
 	npm install js-cookie --save
 	npm install bokehjs
 	HTTPD_CONFIG="/etc/httpd/conf/httpd.conf"
@@ -130,6 +130,10 @@ else
 	echo "################################"
 cat << EOF > $HAPROXY_WI_VHOST_CONF
 <VirtualHost *:$PORT>
+        SSLEngine on
+        SSLCertificateFile /var/www/haproxy-wi/app/certs/haproxy-wi.crt
+        SSLCertificateKeyFile /var/www/haproxy-wi/app/certs/haproxy-wi.key
+
         ServerName haprox-wi.example.com
         ErrorLog /var/log/httpd/haproxy-wi.error.log
         CustomLog /var/log/httpd/haproxy-wi.access.log combined

update.sh

@@ -15,10 +15,10 @@ chmod +x app/*py
 chmod +x app/tools/*py
 
 if hash apt-get 2>/dev/null; then
-	apt-get install git  net-tools lshw dos2unix apache2 gcc netcat python3-pip gcc-c++ openldap-devel libpq-dev python-dev libxml2-dev libxslt1-dev libldap2-dev libsasl2-dev libffi-dev python3-dev -y
+	apt-get install git  net-tools lshw dos2unix apache2 gcc netcat mod_ssl python3-pip gcc-c++ openldap-devel libpq-dev python-dev libxml2-dev libxslt1-dev libldap2-dev libsasl2-dev libffi-dev python3-dev -y
 else
 	yum -y install https://centos7.iuscommunity.org/ius-release.rpm
-	yum -y install git nmap-ncat net-tools python35u dos2unix python35u-pip httpd python35u-devel gcc-c++ openldap-devel 
+	yum -y install git nmap-ncat net-tools python35u dos2unix python35u-pip mod_ssl httpd python35u-devel gcc-c++ openldap-devel 
 fi
 
 cat << EOF > /etc/systemd/system/keep_alive.service