diff --git a/.gitignore b/.gitignore index a205629..77e2efd 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ var/*.lock artifacts/ *.bak .DS_Store +# Bytecode-Cache der Deployment-Skripte +__pycache__/ +*.pyc bin/ obj/ *.user diff --git a/.htaccess b/.htaccess index 5ff373a..7ce8de3 100644 --- a/.htaccess +++ b/.htaccess @@ -34,6 +34,7 @@ Options -Indexes RewriteRule ^api/updateservice/v1(?:/(.*))?$ public/api/updateservice/v1/index.php [L,QSA] RewriteRule ^api/tokens/v1/provision/?$ public/api/tokens/v1/provision.php [L,QSA] RewriteRule ^api/setup/v1(?:/(.*))?$ public/api/setup/v1/index.php [L,QSA] + RewriteRule ^api/supervisor/v1(?:/(.*))?$ public/api/supervisor/v1/index.php [L,QSA] # Fallback fuer direkt adressierte Dateien unterhalb von /api/ RewriteRule ^api/(.*)$ public/api/$1 [L,QSA] @@ -57,7 +58,7 @@ Options -Indexes # ------------------------------------------------------------------ # 5. Alles Uebrige sperren: Anwendungscode, Konfiguration, Skripte # ------------------------------------------------------------------ - RewriteRule ^(config|src|sql|scripts|cli|var|client-dotnet)(/|$) - [F,L] + RewriteRule ^(config|src|sql|scripts|cli|var|client-dotnet|client-php|mcp)(/|$) - [F,L] RewriteRule ^Serverdaten\.txt$ - [F,L] diff --git a/client-dotnet/Deploymentcenter.Packager/Deploymentcenter.Packager.csproj b/client-dotnet/Deploymentcenter.Packager/Deploymentcenter.Packager.csproj index 7a6e193..1c5bb5c 100644 --- a/client-dotnet/Deploymentcenter.Packager/Deploymentcenter.Packager.csproj +++ b/client-dotnet/Deploymentcenter.Packager/Deploymentcenter.Packager.csproj @@ -11,7 +11,6 @@ - diff --git a/public/assets/app.svg b/public/assets/app.svg deleted file mode 100644 index 63a7966..0000000 --- a/public/assets/app.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/public/assets/docker.svg b/public/assets/docker.svg deleted file mode 100644 index fa74b76..0000000 --- a/public/assets/docker.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/public/assets/linux.svg b/public/assets/linux.svg deleted file mode 100644 index d0a2444..0000000 --- a/public/assets/linux.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/public/assets/mysql.svg b/public/assets/mysql.svg deleted file mode 100644 index bf998a4..0000000 --- a/public/assets/mysql.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - MySQL - diff --git a/public/assets/nginx.svg b/public/assets/nginx.svg deleted file mode 100644 index 9b0d133..0000000 --- a/public/assets/nginx.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/public/assets/node.svg b/public/assets/node.svg deleted file mode 100644 index 9d7dba7..0000000 --- a/public/assets/node.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - node - diff --git a/public/assets/php.svg b/public/assets/php.svg deleted file mode 100644 index 38eba68..0000000 --- a/public/assets/php.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - php - diff --git a/public/assets/proxmox.svg b/public/assets/proxmox.svg deleted file mode 100644 index 3253b16..0000000 --- a/public/assets/proxmox.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/public/assets/python.svg b/public/assets/python.svg deleted file mode 100644 index 44fae47..0000000 --- a/public/assets/python.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/public/assets/redis.svg b/public/assets/redis.svg deleted file mode 100644 index d49bac6..0000000 --- a/public/assets/redis.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/public/assets/server.svg b/public/assets/server.svg deleted file mode 100644 index fcda703..0000000 --- a/public/assets/server.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/public/assets/windows.svg b/public/assets/windows.svg deleted file mode 100644 index d5144ee..0000000 --- a/public/assets/windows.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/index.php b/public/index.php index a896714..16f12ef 100644 --- a/public/index.php +++ b/public/index.php @@ -1673,9 +1673,15 @@ function getMonitorIconUrl(?string $icon, ?string $source, ?string $os, ?string if (str_starts_with($icon, 'custom/')) { return 'assets/icons/' . $icon; } - if (str_starts_with($icon, 'assets/')) { + if (str_starts_with($icon, 'assets/icons/')) { return $icon; } + // Fruehere Fassungen legten die Symbole flach unter assets/ ab und + // schrieben diesen Pfad in die Datenbank. Die Dateien liegen jetzt nur + // noch unter assets/icons/ - Altwerte werden hier umgesetzt. + if (str_starts_with($icon, 'assets/')) { + return 'assets/icons/' . substr($icon, strlen('assets/')); + } return 'assets/icons/' . $icon; } diff --git a/scripts/deploy.py b/scripts/deploy.py index d3df8b8..db1acfd 100644 --- a/scripts/deploy.py +++ b/scripts/deploy.py @@ -25,6 +25,10 @@ IGNORE_PATTERNS = { 'log', '__pycache__', 'client-dotnet', + # Bibliothek zum Mitnehmen ins Zielprojekt bzw. lokal ueber stdio + # betriebener MCP-Server - beide gehoeren nicht ins Webroot. + 'client-php', + 'mcp', # Gebaute Installer-Binaries. Sie gehoeren nach /installer/ und werden # von upload_installer.py dorthin gebracht - ueber diesen Weg landeten # sonst ~100 MB zusaetzlich unter /artifacts/ im Webroot.