From 32856797bdb8bf26ebe86394918d0c40dda9aa63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szekeres=20Ba=CC=81lint?= <szekeres.balint@hps.hu>
Date: Tue, 27 Feb 2018 08:36:39 +0100
Subject: [PATCH] IPv4, IPv6 support fixes #8

---
 README.md                 |  1 +
 public/assets/css/app.css |  4 +--
 public/assets/js/app.js   |  7 +++++
 public/index.html         | 54 +++++++++++++++++++++++----------------
 4 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 9c16ea0..c4384df 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ Online nginx configuration generator.
 * HTTP2
 * CDN
 * www / non-www
+* IPv4, IPv6
 * PHP (TCP, 5.x FPM, 7.0 FPM, 7.1 FPM, 7.2 FPM)
 * WordPress security essentials (*including [CVE-2018-6389](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6389)*)
 * pass requests to index.php
diff --git a/public/assets/css/app.css b/public/assets/css/app.css
index 8f1493b..b96bdb8 100644
--- a/public/assets/css/app.css
+++ b/public/assets/css/app.css
@@ -130,9 +130,9 @@ main .options .card .form-group {
 }
 
 main .options .card .form-subgroup {
-	margin-left: 5px;
+	margin-left: 0.35rem;
 	border-left: 2px solid #ced4da;
-	padding-left: 11px;
+	padding-left: 0.5rem;
 }
 
 main .options .card .form-control[type="text"]:placeholder-shown,
diff --git a/public/assets/js/app.js b/public/assets/js/app.js
index 5af0d57..186c214 100644
--- a/public/assets/js/app.js
+++ b/public/assets/js/app.js
@@ -25,6 +25,9 @@
 		///////////////////////
 		var masonry;
 		var data = {
+			ipv4:				'*',
+			ipv6:				'::',
+
 			domain:				'',
 			path:				'',
 			document_root:		'/public',
@@ -247,6 +250,10 @@
 			return $scope.data.file_structure === 'unified';
 		};
 
+		$scope.isIPv6 = function() {
+			return !!$scope.data.ipv6;
+		};
+
 		$scope.isModularized = function() {
 			return !$scope.isUnified();
 		};
diff --git a/public/index.html b/public/index.html
index 710a63a..e0b2953 100644
--- a/public/index.html
+++ b/public/index.html
@@ -91,36 +91,46 @@
 											<span tooltips tooltip-template="Let's Encrypt based SSl.<br><br><i>free, automated, and open Certificate Authority</i>">Let's Encrypt</span>
 										</label>
 									</div>
-									<div class="form-subgroup" ng-if="isHTTPS() && isLetsEncrypt()" ng-cloak>
-										<div class="form-group">
-											<label class="form-label small">
-												<span tooltips tooltip-template="Let's Encrypt expiration notify e-mail.">E-mail</span>
-											</label>
-											<input type="text" class="form-control form-control-sm" ng-model="data.email" placeholder="{{ 'hello@' + domain() }}">
-										</div>
+									<div class="form-group" ng-if="isHTTPS() && isLetsEncrypt()">
+										<label class="form-label small">
+											<span tooltips tooltip-template="Let's Encrypt expiration notify e-mail.">E-mail</span>
+										</label>
+										<input type="text" class="form-control form-control-sm" ng-model="data.email" placeholder="{{ 'hello@' + domain() }}">
 									</div>
-								</div>
-								<div class="form-subgroup" ng-if="isHTTPS()" ng-cloak>
 									<div class="form-check">
 										<input class="form-check-input" type="radio" id="custom_cert" ng-model="data.cert_type" value="custom">
 										<label class="form-check-label" for="custom_cert">
 											<span tooltips tooltip-template="Custom certificate">Custom certificate</span>
 										</label>
 									</div>
-									<div class="form-subgroup" ng-if="isHTTPS() && isCustomCert()" ng-cloak>
-										<div class="form-group">
-											<label class="form-label small">
-												<span tooltips tooltip-template="Path to crt file"><code>ssl_certificate</code></span>
-											</label>
-											<input type="text" class="form-control form-control-sm" ng-model="data.ssl_certificate" placeholder="{{ '/etc/nginx/ssl/' + domain() + '.crt' }}">
+									<div class="form-group" ng-if="isHTTPS() && isCustomCert()">
+										<label class="form-label small">
+											<span tooltips tooltip-template="Path to crt file"><code>ssl_certificate</code></span>
+										</label>
+										<input type="text" class="form-control form-control-sm" ng-model="data.ssl_certificate" placeholder="{{ '/etc/nginx/ssl/' + domain() + '.crt' }}">
+									</div>
+									<div class="form-group" ng-if="isHTTPS() && isCustomCert()">
+										<label class="form-label small">
+											<span tooltips tooltip-template="Path to key file"><code>ssl_certificate_key</code></span>
+										</label>
+										<input type="text" class="form-control form-control-sm" ng-model="data.ssl_certificate_key" placeholder="{{ '/etc/nginx/ssl/' + domain() + '.key' }}">
+									</div>
+								</div>
+								<div class="mt-2">
+									<div class="form-group">
+										<div class="input-group input-group-sm">
+											<div class="input-group-prepend">
+												<div class="input-group-text">IPv4</div>
+											</div>
+											<input type="text" class="form-control form-control-sm" ng-model="data.ipv4">
 										</div>
 									</div>
-									<div class="form-subgroup" ng-if="isHTTPS() && isCustomCert()" ng-cloak>
-										<div class="form-group">
-											<label class="form-label small">
-												<span tooltips tooltip-template="Path to key file"><code>ssl_certificate_key</code></span>
-											</label>
-											<input type="text" class="form-control form-control-sm" ng-model="data.ssl_certificate_key" placeholder="{{ '/etc/nginx/ssl/' + domain() + '.key' }}">
+									<div class="form-group">
+										<div class="input-group input-group-sm">
+											<div class="input-group-prepend">
+												<div class="input-group-text">IPv6</div>
+											</div>
+											<input type="text" class="form-control form-control-sm" ng-model="data.ipv6">
 										</div>
 									</div>
 								</div>
@@ -141,7 +151,7 @@
 									</label>
 								</div>
 								<div class="form-group">
-									<div class="input-group" tooltips tooltip-template="PHP-FPM via TCP or unix socket.">
+									<div class="input-group input-group-sm" tooltips tooltip-template="PHP-FPM via TCP or unix socket.">
 										<div class="input-group-prepend">
 											<div class="input-group-text">PHP</div>
 										</div>