Use craft prefix env

craftcms · Apr 11, 2022 · 4b9fd66 · 4b9fd66
1 parent d11c7be
commit 4b9fd66
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 62 deletions.
diff --git a/.env.bref b/.env.bref
@@ -1,5 +1,5 @@
-ENVIRONMENT=dev
-SECURITY_KEY=temp
+CRAFT_ENVIRONMENT=dev
+CRAFT_SECURITY_KEY=temp
 
 DB_SERVER=postgres
 DB_DATABASE=europa

diff --git a/.env.docker b/.env.docker
@@ -1,4 +1,4 @@
-SECURITY_KEY=temp
+CRAFT_SECURITY_KEY=temp
 
 HOST_WEB_PORT=8080
 HOST_DB_PORT=

diff --git a/.env.example b/.env.example
@@ -1,6 +1,6 @@
-ENVIRONMENT=dev
+CRAFT_ENVIRONMENT=dev
 
-SECURITY_KEY=
+CRAFT_SECURITY_KEY=
 
 DB_DRIVER=pgsql
 DB_SERVER=localhost

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
diff --git a/.github/workflows/update-and-reseed.yml b/.github/workflows/update-and-reseed.yml
@@ -2,8 +2,8 @@ name: Update dependencies and reseed
 
 on:
   workflow_dispatch:
-  schedule:
-    - cron: "0 */12 * * *"
+#  schedule:
+#    - cron: "0 */12 * * *"
 
 jobs:
   update_and_reseed:

diff --git a/config/general.php b/config/general.php
@@ -36,7 +36,7 @@
         'enableCsrfProtection' => true,
         'useEmailAsUsername' => true,
         'omitScriptNameInUrls' => true,
-        'securityKey' => App::env('SECURITY_KEY'),
+        'securityKey' => App::env('CRAFT_SECURITY_KEY'),
         'maxInvalidLogins' => 1000,
         'maxUploadFileSize' => 20000000,
         'resourceBasePath' => dirname(__DIR__) . '/web/cpresources',

diff --git a/web/index.php b/web/index.php
@@ -20,7 +20,7 @@
 }
 
 define('CRAFT_STREAM_LOG', true);
-define('CRAFT_ENVIRONMENT', getenv('ENVIRONMENT') ?: 'production');
+define('CRAFT_ENVIRONMENT', getenv('CRAFT_ENVIRONMENT') ?: 'production');
 
 if ($storagePath = getenv('CRAFT_STORAGE_PATH')) {
     define('CRAFT_STORAGE_PATH', $storagePath);