From 232d35ae0c6f5ffcaea53e18d002fc0660040fa9 Mon Sep 17 00:00:00 2001 From: lgromero Date: Mon, 8 Jul 2024 14:37:09 +0200 Subject: [PATCH] refs #437 delete innecesaries files and changes config ednpoint to status --- etc/apache.conf.tmpl | 25 ----------------- etc/ogliveinfo.json | 13 --------- etc/php-vars.php | 5 ---- etc/php-vars.php.tmpl | 5 ---- etc/repoinfo.json | 5 ---- etc/ssl/WebConsole.crt.pem | 22 --------------- etc/ssl/WebConsole.key.pem | 27 ------------------- etc/ssl/ogAdmSrv.crt.pem | 22 --------------- etc/ssl/ogAdmSrv.key.pem | 27 ------------------- .../Controller/OgBootController.php | 10 +++---- 10 files changed, 5 insertions(+), 156 deletions(-) delete mode 100644 etc/apache.conf.tmpl delete mode 100644 etc/ogliveinfo.json delete mode 100644 etc/php-vars.php delete mode 100644 etc/php-vars.php.tmpl delete mode 100644 etc/repoinfo.json delete mode 100644 etc/ssl/WebConsole.crt.pem delete mode 100644 etc/ssl/WebConsole.key.pem delete mode 100644 etc/ssl/ogAdmSrv.crt.pem delete mode 100644 etc/ssl/ogAdmSrv.key.pem diff --git a/etc/apache.conf.tmpl b/etc/apache.conf.tmpl deleted file mode 100644 index 9cb8589..0000000 --- a/etc/apache.conf.tmpl +++ /dev/null @@ -1,25 +0,0 @@ -# OpenGnsys ogdhcp configuration for Apache. - -Alias /opengnsys3/rest OGHDPCDIR - -# PHP-FPM configuration - - - SetHandler "proxy:fcgi://127.0.0.1:9000" - - - -RewriteEngine On - -# Default configuration. - - Require all granted - Options -Indexes +FollowSymLinks - DirectoryIndex index.php - AddType octet/stream .pkg - Header set Access-Control-Allow-Origin "*" - Header set Access-Control-Allow-Methods "GET,POST,OPTIONS,DELETE,PUT" - Header set Access-Control-Allow-Headers "x-requested-with, Content-Type, origin, authorization, accept, client-security-token" - FallbackResource /index.php - - diff --git a/etc/ogliveinfo.json b/etc/ogliveinfo.json deleted file mode 100644 index 21afcf9..0000000 --- a/etc/ogliveinfo.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "oglive": [ - { - "distribution": "focal", - "kernel": "5.11.0-22-generic", - "architecture": "amd64", - "revision": "r20210413", - "directory": "ogLive-5.11.0-r20210413", - "iso": "ogLive-focal-5.11.0-22-generic-amd64-r20210413.992ebb9.iso" - } - ], - "default": 0 -} diff --git a/etc/php-vars.php b/etc/php-vars.php deleted file mode 100644 index cbf0c95..0000000 --- a/etc/php-vars.php +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/etc/php-vars.php.tmpl b/etc/php-vars.php.tmpl deleted file mode 100644 index 74e4617..0000000 --- a/etc/php-vars.php.tmpl +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/etc/repoinfo.json b/etc/repoinfo.json deleted file mode 100644 index 4cb14b0..0000000 --- a/etc/repoinfo.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "directory": "/opt/opengnsys/images", - "images": [], - "ous": [] -} diff --git a/etc/ssl/WebConsole.crt.pem b/etc/ssl/WebConsole.crt.pem deleted file mode 100644 index b413f61..0000000 --- a/etc/ssl/WebConsole.crt.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDtzCCAZ8CAhABMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEmNhLm9wZW5n -bnN5cy5sb2NhbDAeFw0yNDAyMTMxNzI2MDlaFw0yNTAyMjIxNzI2MDlaMCUxIzAh -BgNVBAMMGldlYkNvbnNvbGUub3Blbmduc3lzLmxvY2FsMIIBIjANBgkqhkiG9w0B -AQEFAAOCAQ8AMIIBCgKCAQEA4ZbzWdu3fZu/sJvAmugapuNe2SCmW+XjbnSn1GUS -Rx/VYlyr7BBQDDQTfYnSvL2Nc0aCjkyjR2G5E9rTN2OAkvVST7lozt1sqCx1WXhH -Skhb2tnWjCMWqEL+jhwNc6RlS3TVGAIdzGBiVl+tdMTGBJW0j1nvyGke0R5GOtem -psuCkOGnhDJsGNY6hksVuJm9UY64GPGTO/KAFsbdjsvzegwFYxVIaodxNf545vsQ -+OPRa42myXuEkP3ZSjrpeMYJ147XSF0v7zl10nckwHpEqP0cyfjXMHOicM4cLUqn -VBGOifqSrPhw6hx5ti/a2Voop6utAvT/2Au8xTrJm5SssQIDAQABMA0GCSqGSIb3 -DQEBCwUAA4ICAQCJt+lCL6pJQQtXl0rF2v5ManknvfEdUbWCJ36504LdSG/1laEi -Dw4xA4ziRV8X8AwAajUQLbP5KE167oMcEC8BlOgS+MEKK8erGhxBZbRUfS+ehryl -6//eC6cZyAg5LWlqWZZ4VPdkT03gPr+qVkB416BeFxbbPghx+nLkr1ZG8cL3whcA -dcE883dDeRAUh+BmlbCzmD3BhY86YbeY0YWf0Wm5eJfHlO2HRzPX+ewd0RSc++g6 -qRnt1vfRMN2jhyFC/VVFEvwKAmXvDktnCh4w8VkGnM+mXxeXz5vdEu1l1A46m8W2 -FD0RL9bmesqZQWtAOprmwvNtRI1q4YaiaZVdqGPDAgS1xuZnYHZPl/3t+V/y7SGv -c2igI7WfMBlcE0OqDJVBnHS2gsY9YeK4SVcWubmWwRPW2b0AkElim3LHORzdcKX8 -fZluh9DJu1pZ9IpLjuhIfYK0+6IfqRsd2wgN0L0soPfczt8D80v3ovUkznE47k6X -hFr2F9EwhG/o3FVGJSYB45EUPxJQASu4vsBXjiY7+pBoPrFlEgaOFdIHNCcLYcsr -CPf7+uh7NKhUsm6pMGMuf9/w46d02P0PhrxbtJk4+i4QXsHiYXO1aCvyumzFKhHK -BIZ1LZs8CE8bzYkjl1OpaLc8wI2V0N8v1XVY2Sim+ZjoHk0iZaazGcAaog== ------END CERTIFICATE----- diff --git a/etc/ssl/WebConsole.key.pem b/etc/ssl/WebConsole.key.pem deleted file mode 100644 index 1a41019..0000000 --- a/etc/ssl/WebConsole.key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEA4ZbzWdu3fZu/sJvAmugapuNe2SCmW+XjbnSn1GUSRx/VYlyr -7BBQDDQTfYnSvL2Nc0aCjkyjR2G5E9rTN2OAkvVST7lozt1sqCx1WXhHSkhb2tnW -jCMWqEL+jhwNc6RlS3TVGAIdzGBiVl+tdMTGBJW0j1nvyGke0R5GOtempsuCkOGn -hDJsGNY6hksVuJm9UY64GPGTO/KAFsbdjsvzegwFYxVIaodxNf545vsQ+OPRa42m -yXuEkP3ZSjrpeMYJ147XSF0v7zl10nckwHpEqP0cyfjXMHOicM4cLUqnVBGOifqS -rPhw6hx5ti/a2Voop6utAvT/2Au8xTrJm5SssQIDAQABAoIBAGHuB6JAkX1DuYlP -c+NLUxaTqb8UP2OxfnOazKiVX8Pke9uBY1jNFBLYIIXk6MjqeJdMSqy/dDouoAuQ -eRSYa15ghOT7FhaHZP30ntTCNCB5HPb6jfqz2MgenSbP4r8K5LZG96K+eHUaelYI -nuIL8fJXktSQNFmJ2MjrHY25xCyvZwt0q5u/e3FcPQmEhtNudEiOoo1PL2oZLXlF -lQMed6lIofz4xbKPGCuASGyOpd1w+A4z6Ms39RQKxBedEvN45xmZM5I/An5yxlzb -E/A9jM3BC+vbNdhDIzYNF/nE5FpQWQkLfG5gj3zK3Hq4pKBapif4z1MmfIKCPzd6 -18aUneECgYEA/LjYfBuwQrOWbuMO8cmca6nQ5GGQML0IZ+EZxC7tQSehIW492psH -0RZirfDpMPge2w9vHbG1xFN8tXgbfx5tADsqDGLb+bzM7Iyaw7oRExgCqb8j6+OD -7JAIxR6pXO1YSpbTybYHT2z2g5mEWYUBP6vs5LcQDAPBZkwM1LEQft0CgYEA5IQD -Rm9oxqQmWEhI3FymCeBL08nv6Q/aUMTBuHUFPO7gV5HDlz6Vbj/2UNj1uYaVcCrh -lyftMlHp80NKyCnnD4b5piJ4uoxJeMYAOIoBfQzCbeMfDKKANX+WTAkY6YPs+aXV -e0sDN++xWcfAnvXxu01+nP9Nka97EyIKPYl+ZeUCgYBOVJi89vQN6I3y9quWI7A4 -6pyVfOvtP1oQoIOU/BqLfFYD/6BqVmz40KBrW2VbyTv/F+yP3poBLQNVV9Hl968/ -SBdDWYzm/i7iDr6VdeF+8o04wcbHgXBNbWNafaNu6x3XmKIyPhpL8vEBXx7XhFMb -whUd2uO9ZZiXNXEwp2T+fQKBgGZYWb8qFpsg2augdEF9nT+/HTb1smWHnBegh8K9 -ZmMr+X4+4oLSnMqMCx2ajjNRe4yJKBAy6aEn3sf803liiwIBSb6GodurCRz2URMB -fDkthccBed6GyTUst3vGd0netDv7cemOZxqeV6gGNtb7ABELXDGkhnFBTrX7AOse -sWWhAoGAOclKs7FGhCNoeyP6JUlYfmzjv/h3rPHSjl1vYkUeEcbvsrTvo5ovN1DX -Ab5MRVtFwpk5AubQLxJC2bWH8IhEvDXYGgB5dJ156IDEEdkvfI3XANCROaDcxM8Y -zFHM3cVE0OXMCApbJwV+4EEE2qu0u7yeaeSIXgPBN0h8vEmeGgo= ------END RSA PRIVATE KEY----- diff --git a/etc/ssl/ogAdmSrv.crt.pem b/etc/ssl/ogAdmSrv.crt.pem deleted file mode 100644 index 8b1c7b0..0000000 --- a/etc/ssl/ogAdmSrv.crt.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDtTCCAZ0CAhAAMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEmNhLm9wZW5n -bnN5cy5sb2NhbDAeFw0yNDAyMTMxNzI2MDlaFw0yNTAyMjIxNzI2MDlaMCMxITAf -BgNVBAMMGG9nQWRtU3J2Lm9wZW5nbnN5cy5sb2NhbDCCASIwDQYJKoZIhvcNAQEB -BQADggEPADCCAQoCggEBAMM2LJ1akgv02hJmWxLg7XmXbB5MIM5S35nVu4qfUzuL -M404BaD0Cvd70Ul/dOhhXy1NClAf4/c/AnDdR7/C/+La8KKYQjIi0sb/ozPezHO+ -0ybHb/9ZmOBhbFwz2EHmWR8ofCgRd8UODBYvfQd0YnScDvUz8FEoMQHn1ftnC3Qz -CqCd/MP7jxu4GkFZ9bo5/ezNv/ovR8U4qMvNEzt/30964rTDDghu1eNKF6bzLqaf -3UHTtW64ygljaoO30XPQW4lbXOsXzZbO0neGC1uOR/QM0ptjrB0NFHirevuBuNiW -CeR09l5yLEq32xJZ5xNWCyiqiv+KXrHHb0i7tVmMfb8CAwEAATANBgkqhkiG9w0B -AQsFAAOCAgEAsFqxUHB2PS4cx4AMDuXG1tv3c3hcy95g66kpU8rbGvYvjcdF4Pxl -iiluxU5VSx/8+gwvLhXhTwEirBSq9vJYCB9jM4Wib8Mii+6cWJeWLyf3O73x+H8M -NoU9SQmSa1rw+k+rv+Bdz5LBWCbYNQs4rkDfzxS81K179BqRAHdvbPs+8p2A8mTu -HgMHIBB1DDYejnT4KsiBfpzLCUJmYrlU2gHVKQ+DspBzPD9MamAA18Er0Ln8Lnbu -0F/jWCh/U+dTuakzxVQJU04mky/uU8S+U5KN713JYEt+Iawoha9J0sDN4qdtgIe2 -Wa22L1YOcj9Za4wnAokpHCfuow9yYs/glAoTMv/YXJmuUUX+U79nmO4II79xY1uO -A/eXZkHZ5fakBwe7+bRU/IXLnUeoU2Ya8N/aCFBbNzV6VfdFeSW0Lq45eWD7PPPa -yDMEstnpRiDr99ICfvjK5Qus9WAF6ZeELBouFQ58ry3C2B3s33osPEyVS1sQ62Sn -ErcYioJqp4rzu2TnKa3UXCCx62QgMmm2TNu2Kz37EpWUSs+IOwjHEz+d2HvrduOE -ezZikkc2MKAv1a0wH6GkOvg5rEs6+muOXloXtUzjQfr4canqLaOlgTI8KqtDVDIA -CVdnt92D/jWODFwQJztZZfvVjqUvoHrvvOsTWP1PW4zZNQ3HHBQ0YLw= ------END CERTIFICATE----- diff --git a/etc/ssl/ogAdmSrv.key.pem b/etc/ssl/ogAdmSrv.key.pem deleted file mode 100644 index 807dcf7..0000000 --- a/etc/ssl/ogAdmSrv.key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAwzYsnVqSC/TaEmZbEuDteZdsHkwgzlLfmdW7ip9TO4szjTgF -oPQK93vRSX906GFfLU0KUB/j9z8CcN1Hv8L/4trwophCMiLSxv+jM97Mc77TJsdv -/1mY4GFsXDPYQeZZHyh8KBF3xQ4MFi99B3RidJwO9TPwUSgxAefV+2cLdDMKoJ38 -w/uPG7gaQVn1ujn97M2/+i9HxTioy80TO3/fT3ritMMOCG7V40oXpvMupp/dQdO1 -brjKCWNqg7fRc9BbiVtc6xfNls7Sd4YLW45H9AzSm2OsHQ0UeKt6+4G42JYJ5HT2 -XnIsSrfbElnnE1YLKKqK/4pescdvSLu1WYx9vwIDAQABAoIBAEDpIqywESAoqtqz -blU4tb5Yu3rXlZEFvZRJnbLah7Kk9t9eYYDDpWHlqhHmb9lVh3BozaUW9ZahPQ6K -hfEdxjiI1Ls8JcbGDZBeMMZur01Nhqi+aF9gS5VQz9dY5fADyF6z95TbOhgsM5is -8cYozRQ5UD/4pVBXLPSVQnH2MbjRKjNPyAk3rZbUrJJiGSpSX0fBe93a/v14keTG -SIY98oiKGDplBWzsCBTkEK1LqeeS80XR6zqOH1+VJM9qmDA/L5UAmdexKqpjmiRh -E4iQWy2N9VkN5jr4W123S/O7+q2Pcwsn4ZbQnM/Hib86DCrhPNQyt8e2hJACe4GE -DOmemQECgYEA/h1Fb5xQVSjFr+YgKbbDHvUEtdtg6DzVn4CWwGw5WKzpqgO5GSZg -3l1iU0Gqmf1RaHkP9m1TYVxLcfm+8NJT7WJfkF75ztIulukx6FRe9lTlbStV8+Wd -R4LluqkN774anRHct6s2pJkBelgP+tr8O4f+PfAQ7VwoxOBTuIXN+6UCgYEAxKkC -JRukkV4Okb6r8LUjTe7BGkrlV1nfSNrnmbYDUk5mu9WJBNYyLyXnU2qW3/6tP30k -6JX2NWPssE8l5fRKDy8QTNNphucK8KeSQh2xt+VX2wSAwkMbVSitlDXKE8yMVZRA -gaD5g43y+gXNvGuxr2w8434zwPPMZHCufZs4ppMCgYAsIf1LMwSopZofwIHZfMpK -eBdHVkBwVRBs0TJdXO5gvjceteLRwV6Vf/Zxqzfr4pje4hepnrcac6MOumc0//Jf -ifQ66KPODabVws5OIUkU0w29dgdJgplcMBmh33ZyKrwIh2+j3nJxB7m/+8das+mW -lTnMnAL0lkrmVmdz5pktmQKBgQC0K8rlSGALNkrOyAsqqilAGv8bIYbf8lyYmMUa -lCCS5XVFnSq9Hag4fddjGwJDEUaUJgkMdWduHrAYD0s/VAINyyZ53C6QA1iIhl1+ -6UmKmzlUVNnKIEUITg5I/Ma4QOxI81vt5xbxqbjzyyFkAJ53gwh9u3+axUF6u6mB -NhY+tQKBgQD4++R/GtPiX/oK5vEDqoKMEkP35/zhsgbVuJYIjGrIIzq9yxg33wua -pXyB29xNvu3E+n0jod9RuD+HYOmFHlfa+Jy3F5NWwxS+b5naDjeVkcZwfPPkwI+z -uqpM0XgFL6CUBfR01rXCfF0Tfo3cQBd1THpan76ayUIKZgAXMY5Arg== ------END RSA PRIVATE KEY----- diff --git a/src/OgBootBundle/Controller/OgBootController.php b/src/OgBootBundle/Controller/OgBootController.php index 04b3b53..8231ded 100644 --- a/src/OgBootBundle/Controller/OgBootController.php +++ b/src/OgBootBundle/Controller/OgBootController.php @@ -68,13 +68,13 @@ Regenerar plantilla - PUT /ogboot/pxe-templates } /** - * @Route("/ogboot/v1/config", name="getConfig", methods={"GET"}) + * @Route("/ogboot/v1/status", name="getStatus", methods={"GET"}) * @OA\Get( - * path="/ogboot/v1/config", - * summary="Get ogboot configuration", + * path="/ogboot/v1/status", + * summary="Get ogboot status", * @OA\Response( * response=200, - * description="Configuration retrieved successfully", + * description="Status retrieved successfully", * @OA\JsonContent( * type="object", * @OA\Property(property="disk_usage", type="object", @@ -89,7 +89,7 @@ Regenerar plantilla - PUT /ogboot/pxe-templates * ) * ) */ -public function getConfig(): Response +public function getStatus(): Response { // Call oglivecli to get disk usage $diskUsageResult = $this->curlRequestService->callOgLive("disk_usage");