From 17f2c9d9d15ab31a6d82fd8b6d008bf0455edf63 Mon Sep 17 00:00:00 2001 From: steffen Date: Tue, 3 Jun 2025 23:13:07 +0200 Subject: [PATCH] App aus Dateinamen entfernt --- xxx/app/lib/{XxxApp.pm => Xxx.pm} | 5 ++- .../Controller/Api/Jstreetemplate.pm | 2 +- .../lib/{XxxApp => Xxx}/Controller/Menu.pm | 2 +- xxx/app/lib/{XxxApp => Xxx}/Helpers.pm | 13 ++++++- xxx/app/lib/{XxxApp => Xxx}/Main.pm | 2 +- xxx/app/morbo.sh | 2 +- xxx/app/script/{XxxApp => Xxx} | 2 +- xxx/app/t/01_routes.t | 6 ++-- xxx/app/templates/layouts/index.html.ep | 13 +++---- xxx/app/test.sh | 0 xxx/app/xxx.conf | 28 +++++++++++++++ xxx/app/xxx_app.conf | 35 ------------------- xxx/deb/DEBIAN/conffiles | 2 +- xxx/deb/pbuild.sh | 2 +- xxx/deb/prod/{xxx_app.conf => xxx.conf} | 0 .../lib/systemd/system/steffen-xxx.service | 8 ++--- xxx/deb/usr/lib/tmpfiles.d/steffen-xxx.conf | 1 + 17 files changed, 62 insertions(+), 61 deletions(-) rename xxx/app/lib/{XxxApp.pm => Xxx.pm} (95%) rename xxx/app/lib/{XxxApp => Xxx}/Controller/Api/Jstreetemplate.pm (99%) rename xxx/app/lib/{XxxApp => Xxx}/Controller/Menu.pm (75%) rename xxx/app/lib/{XxxApp => Xxx}/Helpers.pm (75%) rename xxx/app/lib/{XxxApp => Xxx}/Main.pm (98%) mode change 100644 => 100755 xxx/app/morbo.sh rename xxx/app/script/{XxxApp => Xxx} (80%) mode change 100644 => 100755 xxx/app/test.sh create mode 100644 xxx/app/xxx.conf delete mode 100644 xxx/app/xxx_app.conf rename xxx/deb/prod/{xxx_app.conf => xxx.conf} (100%) diff --git a/xxx/app/lib/XxxApp.pm b/xxx/app/lib/Xxx.pm similarity index 95% rename from xxx/app/lib/XxxApp.pm rename to xxx/app/lib/Xxx.pm index 64c220e..0291175 100644 --- a/xxx/app/lib/XxxApp.pm +++ b/xxx/app/lib/Xxx.pm @@ -1,4 +1,4 @@ -package XxxApp; +package Xxx; use Mojo::Base 'Mojolicious'; use Time::localtime; @@ -8,7 +8,6 @@ sub startup { # einlesen der lokalen Config my $config = $self->plugin('Config'); - # $self->plugin('Config', 'file' => $config->{zus_config}); # hier und in der konfig zus_config aktivieren $self->secrets([ $config->{secret}]); @@ -43,7 +42,7 @@ sub startup { # $config->{test} = $self->dbxxx->{dsn} =~ m/dbs-test/gxms; # Local Helpers - $self->plugin('XxxApp::Helpers' => { verbose => 1 }); + $self->plugin('Xxx::Helpers' => { verbose => 1 }); # https://editor.swagger.io/?url=https://petstore.swagger.io/v2/swagger.yaml $self->plugin('OpenAPI' => { diff --git a/xxx/app/lib/XxxApp/Controller/Api/Jstreetemplate.pm b/xxx/app/lib/Xxx/Controller/Api/Jstreetemplate.pm similarity index 99% rename from xxx/app/lib/XxxApp/Controller/Api/Jstreetemplate.pm rename to xxx/app/lib/Xxx/Controller/Api/Jstreetemplate.pm index 38a906a..980e58a 100644 --- a/xxx/app/lib/XxxApp/Controller/Api/Jstreetemplate.pm +++ b/xxx/app/lib/Xxx/Controller/Api/Jstreetemplate.pm @@ -1,4 +1,4 @@ -package XxxApp::Controller::Api::Jstreetemplate; +package Xxx::Controller::Api::Jstreetemplate; use Mojo::Base 'Mojolicious::Controller'; use Data::Printer; diff --git a/xxx/app/lib/XxxApp/Controller/Menu.pm b/xxx/app/lib/Xxx/Controller/Menu.pm similarity index 75% rename from xxx/app/lib/XxxApp/Controller/Menu.pm rename to xxx/app/lib/Xxx/Controller/Menu.pm index b54f2f1..c54d0ce 100644 --- a/xxx/app/lib/XxxApp/Controller/Menu.pm +++ b/xxx/app/lib/Xxx/Controller/Menu.pm @@ -1,4 +1,4 @@ -package XxxApp::Controller::Menu; +package Xxx::Controller::Menu; use Mojo::Base 'Mojolicious::Controller'; sub jstreetemplate { diff --git a/xxx/app/lib/XxxApp/Helpers.pm b/xxx/app/lib/Xxx/Helpers.pm similarity index 75% rename from xxx/app/lib/XxxApp/Helpers.pm rename to xxx/app/lib/Xxx/Helpers.pm index 4d1daa8..015b024 100644 --- a/xxx/app/lib/XxxApp/Helpers.pm +++ b/xxx/app/lib/Xxx/Helpers.pm @@ -1,4 +1,4 @@ -package XxxApp::Helpers; +package Xxx::Helpers; use Mojo::Base 'Mojolicious::Plugin'; sub register { @@ -6,6 +6,7 @@ sub register { $app->helper('trim' => \&_trim); $app->helper('debuglog' => \&_debuglog); + $app->helper('authenticate' => \&_authenticate); $app->log->info(sprintf('REGISTERED: %s', __PACKAGE__)) if !!$args->{verbose}; return; @@ -27,4 +28,14 @@ sub _debuglog { return 1; } +sub _authenticate { + my ($c, $username, $password) = @_; + + + + + return 1; # or return 0 on failure +} + + 1; diff --git a/xxx/app/lib/XxxApp/Main.pm b/xxx/app/lib/Xxx/Main.pm similarity index 98% rename from xxx/app/lib/XxxApp/Main.pm rename to xxx/app/lib/Xxx/Main.pm index 08b8a03..9f415ee 100644 --- a/xxx/app/lib/XxxApp/Main.pm +++ b/xxx/app/lib/Xxx/Main.pm @@ -1,4 +1,4 @@ -package XxxApp::Main; +package Xxx::Main; use Mojo::Base 'Mojolicious::Controller'; sub main { diff --git a/xxx/app/morbo.sh b/xxx/app/morbo.sh old mode 100644 new mode 100755 index c821273..fccb56d --- a/xxx/app/morbo.sh +++ b/xxx/app/morbo.sh @@ -1,4 +1,4 @@ #!/bin/bash cd "${0%/*}" -morbo -l http://*:hypnotoadport script/XxxApp -w templates -w lib -w *.conf -w *.json +morbo -l http://*:hypnotoadport script/Xxx -w templates -w lib -w *.conf -w *.json diff --git a/xxx/app/script/XxxApp b/xxx/app/script/Xxx similarity index 80% rename from xxx/app/script/XxxApp rename to xxx/app/script/Xxx index 8f6c8b9..5f29c30 100644 --- a/xxx/app/script/XxxApp +++ b/xxx/app/script/Xxx @@ -8,4 +8,4 @@ BEGIN { unshift @INC, "$FindBin::Bin/../lib" } use Mojolicious::Commands; # Start command line interface for application -Mojolicious::Commands->start_app('XxxApp'); +Mojolicious::Commands->start_app('Xxx'); diff --git a/xxx/app/t/01_routes.t b/xxx/app/t/01_routes.t index bf18849..0f78238 100644 --- a/xxx/app/t/01_routes.t +++ b/xxx/app/t/01_routes.t @@ -10,18 +10,18 @@ use DBI; use Data::Printer; #my $dbh = DBI->connect('DBI:mysql:prod:ares', '', '') or die ('Fehler beim Verbinden mit der Datenbank'); -my $t = Test::Mojo->new('XxxApp'); +my $t = Test::Mojo->new('Xxx'); $t->app->log->level('info'); $t->app->ua->max_redirects(1); subtest 'prod konfig test' => sub { - my $konf = do '../deb/prod/xxx_app.conf'; + my $konf = do '../deb/prod/xxx.conf'; is exists $konf->{secret}, 1, 'secret = exists'; is $konf->{htlib}, "/var/local/htlib", 'htlib = /var/local/htlib'; - is $konf->{hypnotoad}->{pid_file}, "/run/xxx.pid", 'hypnotoad->pid_file = /run/xxx.pid'; + is $konf->{hypnotoad}->{pid_file}, "/run/steffen/xxx.pid", 'hypnotoad->pid_file = /run/steffen/xxx.pid'; is $konf->{hypnotoad}->{workers}, 4, 'hypnotoad->workers = 4'; is $konf->{hypnotoad}->{proxy}, 1, 'hypnotoad->proxy = 1'; diff --git a/xxx/app/templates/layouts/index.html.ep b/xxx/app/templates/layouts/index.html.ep index 67e3de5..7fe5b2b 100644 --- a/xxx/app/templates/layouts/index.html.ep +++ b/xxx/app/templates/layouts/index.html.ep @@ -27,10 +27,7 @@