diff --git a/functions.php b/functions.php index 7d1ebbe..6ba6f9d 100644 --- a/functions.php +++ b/functions.php @@ -90,140 +90,6 @@ function redis_remove($key) { } } -function create_install_json($data) { - - - -echo '{ - "DOCKER_REGISTRY_URL": '.$data["registry"].', - "SMARTHOST_PROXY": '.$data["smarthost"].', - "DOMAIN": '.$data["domain"].', - "SELF_SIGNED_CERTIFICATE": '.$data["self_signed"].', - "LOCAL_PROXY": '.$data["localproxy"].', - - - "containers": [ - { - "IMAGE": "redis:'$REDIS_VERSION'", - "NAME": "'$REDIS_SERVER'", - "UPDATE": "true", - "MEMORY": "64M", - "NETWORK": "'$FRAMEWORK_SCHEDULER_NETWORK'", - '$ADDITIONAL', - "PORTS":[ - { "SOURCE": "null", - "DEST": "6379", - "TYPE": "tcp" - } - ], - "POST_START": [] - }, - { - "IMAGE": "'$DOCKER_REGISTRY_URL'/'$FRAMEWORK_SCHEDULER_IMAGE':'$FRAMEWORK_SCHEDULER_VERSION'", - "NAME": "'$FRAMEWORK_SCHEDULER_NAME'", - "UPDATE": "true", - "MEMORY": "256M", - "NETWORK": "'$FRAMEWORK_SCHEDULER_NETWORK'", - '$ADDITIONAL', - "POST_START": [] - }, - { - "IMAGE": "'$DOCKER_REGISTRY_URL'/'$WEB_IMAGE':'$WEBSERVER_VERSION'", - "NAME": "'$WEB_SERVER'", - "UPDATE": "true", - "MEMORY": "128M", - "NETWORK": "'$FRAMEWORK_SCHEDULER_NETWORK'", - '$ADDITIONAL', - "PORTS":[ - { "SOURCE": "'$WEBSERVER_PORT'", - "DEST": "80", - "TYPE": "tcp" - } - ], - "POST_START": [] - } - ] -} - ' | jq -r . >/etc/user/config/services/service-framework.json - - - -putenv('HOME=/home/hael'); -putenv('USER=hael'); - -putenv('LETSENCRYPT_MAIL='.$_POST["letsencrypt_mail"]); -putenv('LETSENCRYPT_SERVERNAME='.$_POST["letsencrypt_servername"]); -putenv('VPN_PROXY='.$_POST["vpn"]); -if ($_POST["vpn"]=="yes") { - putenv('VPN_DOMAIN='.$_POST["vpn_domain"]); - putenv('VPN_KEY='.$_POST["vpn_key"]); - - putenv('LETSENCRYPT_MAIL='.$_POST["letsencrypt_mail"]); - putenv('LETSENCRYPT_SERVERNAME='.$_POST["letsencrypt_servername"]); -} - -if ($_POST["discovery"]=="yes") { - if ($_POST["DISCOVERY_DIR"] == "" ) $_POST["DISCOVERY_DIR"]="/usr/local/bin/"; - if (substr($_POST["DISCOVERY_DIR"],0,1)!="/") { - echo "The path must be absolute, for example /usr/local/bin/. Please type it again."; - exit; - } - if ($_POST["DISCOVERY_CONFIG_FILE"] == "" ) $_POST["DISCOVERY_CONFIG_FILE"]="discovery.conf"; - putenv('DISCOVERY_DIR='.$_POST["discovery_dir"]); - putenv('DISCOVERY_CONFIG_FILE='.$_POST["discovery_config_file"]); -} - - -putenv('ADDITIONALS='.$_POST["additionals"]); -if ($_POST["additionals"]=="yes") { - if ($_POST["SERVICE_DIR"] == "" ) $_POST["SERVICE_DIR"]="/etc/user/config/services"; - putenv('SERVICE_DIR='.$_POST["service_dir"]); - - putenv('NEXTCLOUD='.$_POST["nextcloud"]); - putenv('BITWARDEN='.$_POST["bitwarden"]); - putenv('GUACAMOLE='.$_POST["guacamole"]); - putenv('SMTP='.$_POST["smtp_server"]); - putenv('ROUNDCUBE='.$_POST["roundcube"]); - - if ($_POST["nextcloud"]=="yes") { - putenv('NEXTCLOUD_DOMAIN='.$_POST["nextcloud_domain"]); - putenv('NEXTCLOUD_USERNAME='.$_POST["nextcloud_username"]); - putenv('NEXTCLOUD_PASSWORD='.$_POST["nextcloud_password"]); - } - if ($_POST["bitwarden"]=="yes") { - putenv('BITWARDEN_DOMAIN='.$_POST["bitwarden_domain"]); - putenv('SMTP_SERVER='.$_POST["bitwarden_smtp_server"]); - putenv('SMTP_HOST='.$_POST["bitwarden_smtp_host"]); - putenv('SMTP_PORT='.$_POST["bitwarden_smtp_port"]); - putenv('SMTP_SECURITY='.$_POST["bitwarden_smtp_security"]); - putenv('SMTP_FROM='.$_POST["bitwarden_smtp_from"]); - putenv('SMTP_USERNAME='.$_POST["bitwarden_smtp_username"]); - putenv('SMTP_PASSWORD='.$_POST["bitwarden_smtp_password"]); - putenv('DOMAINS_WHITELIST='.$_POST["bitwarden_domains_whitelist"]); - } - if ($_POST["guacamole"]=="yes") { - putenv('GUACAMOLE_DOMAIN='.$_POST["bitwarden_domain"]); - putenv('GUACAMOLE_ADMIN_NAME='.$_POST["bitwarden_smtp_username"]); - putenv('GUACAMOLE_ADMIN_PASSWORD='.$_POST["bitwarden_smtp_password"]); - if ($_POST["bitwarden_totp"]=="yes") putenv('TOTP_USE=true'); - if ($_POST["bitwarden_ban_duration"]=="") $_POST["bitwarden_ban_duration"]="5"; - putenv('BAN_DURATION='.$_POST["bitwarden_ban_duration"]); - } - if ($_POST["roundcube"]=="yes") { - if ($_POST["roundcube_imap_port"]=="") $_POST["roundcube_imap_port"]="143"; - if ($_POST["roundcube_smtp_port"]=="") $_POST["roundcube_smtp_port"]="25"; - if ($_POST["roundcube_upload"]=="") $_POST["roundcube_smtp_port"]="50M"; - putenv('ROUNDCUBE_IMAP_HOST='.$_POST["roundcube_imap_host"]); - putenv('ROUNDCUBE_IMAP_PORT='.$_POST["roundcube_imap_port"]); - putenv('ROUNDCUBE_SMTP_HOST='.$_POST["roundcube_smtp_host"]); - putenv('ROUNDCUBE_SMTP_PORT='.$_POST["roundcube_smtp_port"]); - putenv('ROUNDCUBE_UPLOAD_MAX_FILESIZE='.$_POST["roundcube_upload"]); - putenv('ROUNDCUBE_DOMAIN='.$_POST["roundcube_domain"]); - } -} - -} - // not in use put_install_envs() { @@ -247,8 +113,6 @@ put_install_envs() { } putenv('LOCAL_PROXY='.$_POST["localproxy"]); - putenv('LETSENCRYPT_MAIL='.$_POST["letsencrypt_mail"]); - putenv('LETSENCRYPT_SERVERNAME='.$_POST["letsencrypt_servername"]); putenv('VPN_PROXY='.$_POST["vpn"]); if ($_POST["vpn"]=="yes") { putenv('VPN_DOMAIN='.$_POST["vpn_domain"]); @@ -257,6 +121,8 @@ put_install_envs() { putenv('LETSENCRYPT_MAIL='.$_POST["letsencrypt_mail"]); putenv('LETSENCRYPT_SERVERNAME='.$_POST["letsencrypt_servername"]); } + putenv('CRON='.$_POST["cron"]); + putenv('DISCOVERY='.$_POST["discovery"]); if ($_POST["discovery"]=="yes") { if ($_POST["DISCOVERY_DIR"] == "" ) $_POST["DISCOVERY_DIR"]="/usr/local/bin/"; diff --git a/install.html b/install.html index e2c7c71..13487fc 100644 --- a/install.html +++ b/install.html @@ -22,7 +22,7 @@
- +
Please enter a valid registry url.
@@ -31,7 +31,7 @@
- @@ -41,7 +41,7 @@
- +
Please enter a valid domain.
@@ -51,7 +51,7 @@
- @@ -60,7 +60,7 @@
- @@ -70,7 +70,7 @@
- +
Please enter a valid domain.
@@ -79,13 +79,13 @@
- +
- +
Please enter a valid email.
@@ -94,14 +94,14 @@
- +
- @@ -114,7 +114,7 @@
- @@ -124,13 +124,13 @@
- +
- +
@@ -141,7 +141,7 @@
- @@ -151,13 +151,13 @@
- +
- @@ -168,26 +168,26 @@
- +
- +
- +
- @@ -198,7 +198,7 @@
- +
diff --git a/install.php b/install.php index b6191f8..f33d374 100644 --- a/install.php +++ b/install.php @@ -1,17 +1,33 @@