beenull/servnest
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add more serverErrors in ht/

Browse source
This commit is contained in:
Miraty 2022-06-09 02:56:21 +02:00
parent c997ac424d
commit f13a58a5b2
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.ini
View file

@ -29,7 +29,7 @@ nginx_config_path = "/etc/nginx/ht"
tor_config_path = "/etc/tor/instances/niver/torrc" tor_config_path = "/etc/tor/instances/niver/torrc"
; Tor keys directory ; Tor keys directory
tor_keys_path = "/var/lib/tor-instances/niver/keys" tor_keys_path = "/var/lib/tor-instances/niver/keys"
tor_service = "tor@niver" tor_service = "tor"
sudo_path = "/usr/bin/sudo" sudo_path = "/usr/bin/sudo"
systemctl_path = "/usr/bin/systemctl" systemctl_path = "/usr/bin/systemctl"

16
public/ht/http-onion.php
View file

@ -35,13 +35,18 @@ if ($dirsStatuses[$_POST['dir']] !== false)
// Add Tor config // Add Tor config
$torConf = file_get_contents(CONF['ht']['tor_config_path']); $torConf = file_get_contents(CONF['ht']['tor_config_path']);
if ($torConf === false)
serverError("Failed to read current Tor configuration.");
$torConf = $torConf . "HiddenServiceDir " . CONF['ht']['tor_keys_path'] . "/" . $_POST['dir'] . "/ $torConf = $torConf . "HiddenServiceDir " . CONF['ht']['tor_keys_path'] . "/" . $_POST['dir'] . "/
HiddenServicePort 80 [::1]:" . CONF['ht']['internal_onion_http_port'] . " HiddenServicePort 80 [::1]:" . CONF['ht']['internal_onion_http_port'] . "
"; ";
file_put_contents(CONF['ht']['tor_config_path'], $torConf); if (file_put_contents(CONF['ht']['tor_config_path'], $torConf) === false)
serverError("Failed to write new Tor configuration.");
// Reload Tor // Reload Tor
exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['systemctl_path'] . " reload " . CONF['ht']['tor_service'], $output); exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['systemctl_path'] . " reload " . CONF['ht']['tor_service'], $output, $code);
if ($code !== 0)
serverError("Failed to reload Tor.");
// Get the address generated by Tor // Get the address generated by Tor
exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['cat_path'] . " " . CONF['ht']['tor_keys_path'] . "/" . $_POST['dir'] . "/hostname", $output); exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['cat_path'] . " " . CONF['ht']['tor_keys_path'] . "/" . $_POST['dir'] . "/hostname", $output);
@ -61,10 +66,13 @@ $nginxConf = 'server {
include inc/ht-onion.conf; include inc/ht-onion.conf;
} }
'; ';
file_put_contents(CONF['ht']['nginx_config_path'] . "/" . $onion . ".conf", $nginxConf); if (file_put_contents(CONF['ht']['nginx_config_path'] . "/" . $onion . ".conf", $nginxConf) === false)
serverError("Failed to write Nginx configuration.");
// Reload Nginx // Reload Nginx
exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['systemctl_path'] . " reload nginx"); exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['systemctl_path'] . " reload nginx", result_code: $code);
if ($code !== 0)
serverError("Failed to reload Nginx.");
// Tell the user their site address // Tell the user their site address
success("L'adresse de votre service Onion HTTP est : <a href='http://" . $onion . "/'<code>http://" . $onion . "/</code></a>"); success("L'adresse de votre service Onion HTTP est : <a href='http://" . $onion . "/'<code>http://" . $onion . "/</code></a>");

7
public/ht/https-domain.php
View file

@ -55,9 +55,12 @@ $nginxConf = 'server {
include inc/ht-tls.conf; include inc/ht-tls.conf;
} }
'; ';
file_put_contents(CONF['ht']['nginx_config_path'] . "/" . $_POST['domain'] . ".conf", $nginxConf); if (file_put_contents(CONF['ht']['nginx_config_path'] . "/" . $_POST['domain'] . ".conf", $nginxConf) === false)
serverError("Failed to write Nginx configuration.");
// Reload Nginx // Reload Nginx
exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['systemctl_path'] . " reload nginx"); exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['systemctl_path'] . " reload nginx", result_code: $code);
if ($code !== 0)
serverError("Failed to reload Nginx.");
success("Accès HTTP par domaine ajouté sur ce dossier !"); success("Accès HTTP par domaine ajouté sur ce dossier !");