Nothing
All checks were successful
continuous-integration/drone/push Build is passing

Merge branch 'main' of ssh://git.format.hu/format/web-installer
This commit is contained in:
gyurix
2024-06-28 12:15:29 +02:00
2 changed files with 21 additions and 20 deletions

View File

@@ -15,7 +15,7 @@
<div class="row"> <div class="row">
<div class="mb-3"> <div class="mb-3">
<label for="registry">Please fill in the docker registry name</label> <label for="registry">Please fill in the docker registry name (default:registry.format.hu):</label>
<input type="registry" class="form-control" name="registry" id="registry" value="registry.format.hu" required> <input type="registry" class="form-control" name="registry" id="registry" value="registry.format.hu" required>
<div class="invalid-feedback"> <div class="invalid-feedback">
Please enter a valid registry url. Please enter a valid registry url.

View File

@@ -1,43 +1,44 @@
<?php <?php
DOCKER_REGISTRY_URL=$_POST["registry"]; putenv('DOCKER_REGISTRY_URL='.$_POST["registry"]);
if ($_POST["smarthost"]=="Y") { if ($_POST["smarthost"]=="Y") {
SMARTHOST_PROXY="yes"; putenv('SMARTHOST_PROXY=yes');
DOMAIN=$_POST["domain"]; putenv('DOMAIN='.$_POST["domain"]);
} }
else { else {
SMARTHOST_PROXY="no"; putenv('SMARTHOST_PROXY=no');
} }
if ($_POST["smarthost"]=="Y") { if ($_POST["smarthost"]=="Y") {
LOCAL_PROXY="yes"; putenv('LOCAL_PROXY=yes');
} }
else { else {
LOCAL_PROXY="no"; putenv('LOCAL_PROXY=no');
} }
if [ "$SMARTHOST_PROXY" == "no" ]; then // TODO - js warning
echo "Warning! Local proxy will not work without smarthost proxy service."; //if [ "$SMARTHOST_PROXY" == "no" ]; then
fi; // echo "Warning! Local proxy will not work without smarthost proxy service.";
//fi;
if ($_POST["vpn"]=="Y") { if ($_POST["vpn"]=="Y") {
VPN_PROXY="yes"; putenv('VPN_PROXY=yes');
} }
else { else {
VPN_PROXY="no"; putenv('VPN_PROXY=no');
} }
putenv('VPN_DOMAIN='.$_POST["vpn_domain"]);
putenv('VPN_KEY='.$_POST["vpn_key"]);
VPN_DOMAIN=$_POST["vpn_domain"]; putenv('LETSENCRYPT_MAIL='.$_POST["letsencrypt_mail"]);
VPN_KEY=$_POST["vpn_key"]; putenv('LETSENCRYPT_SERVERNAME='.$_POST["letsencrypt_servername"]);
LETSENCRYPT_MAIL=$_POST["letsencrypt_mail"];
LETSENCRYPT_SERVERNAME=$_POST["letsencrypt_servername"];
CRON=$_POST["cron"]; putenv('CRON='.$_POST["cron"]);
DISCOVERY=$_POST["discovery"]; putenv('DISCOVERY='.$_POST["discovery"]);
putenv('ADDITIONAL='.$_POST["additional"]);
ADDITIONAL=$_POST["additional"]
?> ?>