wip #7061 @0.25

diff --git a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
index 27041febd403168493bf26fae17254c034f70dd3..35c5ec5403f5e4b601112874e478fac530c221dc 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
+++ b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
@@ -215,7 +215,8 @@ trait DockerWebContainer
             Env::arrayToEnvFile($envPath . '.' . $env, $laravelEnv);
             unlink($envPath);
             unlink($envPath . '.example');
-            copy($laravelSource . '/AppServiceProvider.php', $www . '/app/Providers/AppServiceProvider.php');
+            // TODO test this !
+            `cp -rf $laravelSource/* $www/`;
         }
 
         $variables['$fixrights'] = implode("\n", $fixRights);

diff --git a/resources/tools/dockerwebcontainer/laravel/AppServiceProvider.php b/resources/tools/dockerwebcontainer/laravel/AppServiceProvider.php
deleted file mode 100644 (file)
index 1a3dbc4..0000000
--- a/resources/tools/dockerwebcontainer/laravel/AppServiceProvider.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Support\Facades\URL;
-use Illuminate\Support\ServiceProvider;
-
-class AppServiceProvider extends ServiceProvider
-{
-    /**
-     * Register any application services.
-     */
-    public function register(): void
-    {
-        //
-    }
-
-    /**
-     * Bootstrap any application services.
-     */
-    public function boot(): void
-    {
-        URL::forceScheme('https');
-    }
-}

diff --git a/resources/tools/dockerwebcontainer/laravel/app/Http/Middleware/CheckIfAdmin.php b/resources/tools/dockerwebcontainer/laravel/app/Http/Middleware/CheckIfAdmin.php
new file mode 100644 (file)
index 0000000..0c8e834
--- /dev/null
+++ b/resources/tools/dockerwebcontainer/laravel/app/Http/Middleware/CheckIfAdmin.php
@@ -0,0 +1,7 @@
+<?php
+
+
+class CheckIfAdmin extends \Backpack\CRUD\app\Http\Middleware\CheckIfAdmin
+{
+
+}

diff --git a/resources/tools/dockerwebcontainer/laravel/app/Providers/AppServiceProvider.php b/resources/tools/dockerwebcontainer/laravel/app/Providers/AppServiceProvider.php
new file mode 100644 (file)
index 0000000..1a3dbc4
--- /dev/null
+++ b/resources/tools/dockerwebcontainer/laravel/app/Providers/AppServiceProvider.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\URL;
+use Illuminate\Support\ServiceProvider;
+
+class AppServiceProvider extends ServiceProvider
+{
+    /**
+     * Register any application services.
+     */
+    public function register(): void
+    {
+        //
+    }
+
+    /**
+     * Bootstrap any application services.
+     */
+    public function boot(): void
+    {
+        URL::forceScheme('https');
+    }
+}

diff --git a/resources/tools/dockerwebcontainer/laravel/config/auth.php b/resources/tools/dockerwebcontainer/laravel/config/auth.php
new file mode 100644 (file)
index 0000000..09aef64
--- /dev/null
+++ b/resources/tools/dockerwebcontainer/laravel/config/auth.php
@@ -0,0 +1,142 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Defaults
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default authentication "guard" and password
+    | reset options for your application. You may change these defaults
+    | as required, but they're a perfect start for most applications.
+    |
+    */
+
+    'defaults' => [
+        'guard' => 'web',
+        'passwords' => 'users',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Guards
+    |--------------------------------------------------------------------------
+    |
+    | Next, you may define every authentication guard for your application.
+    | Of course, a great default configuration has been defined for you
+    | here which uses session storage and the Eloquent user provider.
+    |
+    | All authentication drivers have a user provider. This defines how the
+    | users are actually retrieved out of your database or other storage
+    | mechanisms used by this application to persist your user's data.
+    |
+    | Supported: "session"
+    |
+    */
+
+    'guards' => [
+        'web' => [
+            'driver' => 'session',
+            'provider' => 'users',
+        ],
+        'client' => [
+            'driver' => 'session',
+            'provider' => 'clients',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | User Providers
+    |--------------------------------------------------------------------------
+    |
+    | All authentication drivers have a user provider. This defines how the
+    | users are actually retrieved out of your database or other storage
+    | mechanisms used by this application to persist your user's data.
+    |
+    | If you have multiple user tables or models you may configure multiple
+    | sources which represent each model / table. These sources may then
+    | be assigned to any extra authentication guards you have defined.
+    |
+    | Supported: "database", "eloquent"
+    |
+    */
+
+    'providers' => [
+        'users' => [
+            'driver' => 'eloquent',
+            'model' => App\Models\User::class,
+        ],
+
+        'clients' => [
+            'driver' => 'eloquent',
+            'model' => App\Models\Client::class,
+        ],
+
+        'backpack' => [
+            'driver' => 'eloquent',
+            'model' => App\Models\User::class,
+        ],
+
+        // 'users' => [
+        //     'driver' => 'database',
+        //     'table' => 'users',
+        // ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Resetting Passwords
+    |--------------------------------------------------------------------------
+    |
+    | You may specify multiple password reset configurations if you have more
+    | than one user table or model in the application and you want to have
+    | separate password reset settings based on the specific user types.
+    |
+    | The expiry time is the number of minutes that each reset token will be
+    | considered valid. This security feature keeps tokens short-lived so
+    | they have less time to be guessed. You may change this as needed.
+    |
+    | The throttle setting is the number of seconds a user must wait before
+    | generating more password reset tokens. This prevents the user from
+    | quickly generating a very large amount of password reset tokens.
+    |
+    */
+
+    'passwords' => [
+        'users' => [
+            'provider' => 'users',
+            'table' => 'password_reset_tokens',
+            'expire' => 60,
+            'throttle' => 60,
+        ],
+
+        'clients' => [
+            'provider' => 'clients',
+            'table' => 'password_reset_tokens',
+            'expire' => 60,
+            'throttle' => 60,
+        ],
+        'backpack' => [
+            'provider' => 'users',
+            'table' => 'password_reset_tokens',
+            'expire' => 60,
+            'throttle' => 60,
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Confirmation Timeout
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define the amount of seconds before a password confirmation
+    | times out and the user is prompted to re-enter their password via the
+    | confirmation screen. By default, the timeout lasts for three hours.
+    |
+    */
+
+    'password_timeout' => 10800,
+
+];

diff --git a/resources/tools/dockerwebcontainer/template/update b/resources/tools/dockerwebcontainer/template/update
index 86cc0fa5d532b00b3573a63c91c4713d1b2fe47b..82dacf41f22b13f3002b74e9f23fc282bbd749f6 100644 (file)
--- a/resources/tools/dockerwebcontainer/template/update
+++ b/resources/tools/dockerwebcontainer/template/update
@@ -7,5 +7,7 @@ $fixrights
 COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull
 COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
 
-docker compose down
+docker compose down -v
 docker compose up -d
+
+ufw-docker allow $name