Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1a7dead730 | |||
| 7cd6976114 |
@@ -141,6 +141,10 @@ class ActivityServiceProvider extends ServiceProvider
|
||||
*/
|
||||
protected function merge_config_from(string $path, string $key): void
|
||||
{
|
||||
if ($this->app->configurationIsCached()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$existing = config($key, []);
|
||||
$module_config = require $path;
|
||||
|
||||
|
||||
@@ -116,6 +116,10 @@ class ActivityLogServiceProvider extends ServiceProvider
|
||||
*/
|
||||
protected function merge_config_from(string $path, string $key): void
|
||||
{
|
||||
if ($this->app->configurationIsCached()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$existing = config($key, []);
|
||||
$module_config = require $path;
|
||||
|
||||
|
||||
@@ -127,6 +127,10 @@ class AuthServiceProvider extends ServiceProvider
|
||||
*/
|
||||
protected function merge_config_from(string $path, string $key): void
|
||||
{
|
||||
if ($this->app->configurationIsCached()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$existing = config($key, []);
|
||||
$module_config = require $path;
|
||||
|
||||
|
||||
@@ -126,6 +126,10 @@ class DashboardServiceProvider extends ServiceProvider
|
||||
*/
|
||||
protected function merge_config_from(string $path, string $key): void
|
||||
{
|
||||
if ($this->app->configurationIsCached()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$existing = config($key, []);
|
||||
$module_config = require $path;
|
||||
|
||||
|
||||
@@ -113,6 +113,10 @@ class ExternalSystemServiceProvider extends ServiceProvider
|
||||
*/
|
||||
protected function merge_config_from(string $path, string $key): void
|
||||
{
|
||||
if ($this->app->configurationIsCached()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$existing = config($key, []);
|
||||
$module_config = require $path;
|
||||
|
||||
|
||||
@@ -117,6 +117,10 @@ class FeedbackServiceProvider extends ServiceProvider
|
||||
*/
|
||||
protected function merge_config_from(string $path, string $key): void
|
||||
{
|
||||
if ($this->app->configurationIsCached()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$existing = config($key, []);
|
||||
$module_config = require $path;
|
||||
|
||||
|
||||
@@ -143,6 +143,10 @@ class MembershipApplicationServiceProvider extends ServiceProvider
|
||||
*/
|
||||
protected function merge_config_from(string $path, string $key): void
|
||||
{
|
||||
if ($this->app->configurationIsCached()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$existing = config($key, []);
|
||||
$module_config = require $path;
|
||||
|
||||
|
||||
@@ -111,6 +111,10 @@ class NotificationServiceProvider extends ServiceProvider
|
||||
*/
|
||||
protected function merge_config_from(string $path, string $key): void
|
||||
{
|
||||
if ($this->app->configurationIsCached()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$existing = config($key, []);
|
||||
$module_config = require $path;
|
||||
|
||||
|
||||
@@ -117,6 +117,10 @@ class RoleServiceProvider extends ServiceProvider
|
||||
*/
|
||||
protected function merge_config_from(string $path, string $key): void
|
||||
{
|
||||
if ($this->app->configurationIsCached()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$existing = config($key, []);
|
||||
$module_config = require $path;
|
||||
|
||||
|
||||
@@ -179,6 +179,10 @@ class UserServiceProvider extends ServiceProvider
|
||||
*/
|
||||
protected function merge_config_from(string $path, string $key): void
|
||||
{
|
||||
if ($this->app->configurationIsCached()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$existing = config($key, []);
|
||||
$module_config = require $path;
|
||||
|
||||
|
||||
@@ -15,8 +15,7 @@ services:
|
||||
- SESSION_DRIVER=redis
|
||||
- QUEUE_CONNECTION=redis
|
||||
volumes:
|
||||
- app-storage-production:/var/www/storage
|
||||
- app-logs-production:/var/www/storage/logs
|
||||
- /var/lib/mykopkb/storage:/var/www/storage
|
||||
- ./.env:/var/www/.env:ro
|
||||
- ${NGINX_CONF:-./docker/production/nginx/nginx.conf}:/etc/nginx/nginx.conf:ro
|
||||
networks:
|
||||
@@ -37,9 +36,3 @@ networks:
|
||||
mykopkb-production-network:
|
||||
name: mykopkb-production-network
|
||||
external: true
|
||||
|
||||
volumes:
|
||||
app-storage-production:
|
||||
driver: local
|
||||
app-logs-production:
|
||||
driver: local
|
||||
|
||||
Reference in New Issue
Block a user