diff --git a/README.md b/README.md index adfc7d9..a2953f0 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,8 @@ git clone https://gitea.tentakelfabrik.de/Tentakelfabrik/mcp.git ```bash cd mcp sudo ./install.sh + +composer install ``` ## License diff --git a/app/Commands/LetsEncryptInstallCommand.php b/app/Commands/LetsEncryptInstallCommand.php index 44e376d..dd2ba1e 100644 --- a/app/Commands/LetsEncryptInstallCommand.php +++ b/app/Commands/LetsEncryptInstallCommand.php @@ -40,12 +40,23 @@ class LetsEncryptInstallCommand extends Command { $this->info('LetsEncrypt installing...'); + $output = []; exec('apt update 2>&1', $output); - exec('apt-get install software-properties-common 2>&1', $output); + exec('apt install software-properties-common 2>&1', $output); + + // @TODO apt add a Warning for no good, in a later version output will be scanned for helpfull infos + $this->line(implode("\n", Install::filterAptMessages($output))); + + $output = []; exec('add-apt-repository universe 2>&1', $output); exec('add-apt-repository ppa:certbot/certbot 2>&1', $output); - exec('apt-get update 2>&1', $output); - exec('apt-get install certbot python3-certbot-nginx 2>&1', $output); + + // @TODO apt add a Warning for no good, in a later version output will be scanned for helpfull infos + $this->line(implode("\n", Install::filterAptMessages($output))); + + $output = []; + exec('apt update 2>&1', $output); + exec('apt install certbot python3-certbot-nginx 2>&1', $output); // @TODO apt add a Warning for no good, in a later version output will be scanned for helpfull infos $this->line(implode("\n", Install::filterAptMessages($output))); diff --git a/resources/nginx/nginx.blade.php b/resources/nginx/nginx.blade.php index 51f0659..4deebc0 100644 --- a/resources/nginx/nginx.blade.php +++ b/resources/nginx/nginx.blade.php @@ -34,7 +34,7 @@ http { error_log /var/log/nginx.error_log warn; # no logging for 3XX - map \$status \$loggable { + map $status $loggable { ~^[3] 0; default 1; }