diff --git a/.env b/.env index 2c3af9b..3bdb8ed 100644 --- a/.env +++ b/.env @@ -15,6 +15,5 @@ CAS_MAIL=mail CAS_LASTNAME=lastname CAS_FIRSTNAME=firstname -CORPUS_URL= -CORPUS_USERNAME= -CORPUS_PASSWORD= +ROUTE_DICOS=/app/misc/sample/dicos +ROUTE_SOURCES=/app/misc/sample diff --git a/config/services.yaml b/config/services.yaml index b2e0425..0e392c0 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -11,7 +11,8 @@ parameters: casMail: "%env(resolve:CAS_MAIL)%" casLastname: "%env(resolve:CAS_LASTNAME)%" casFirstname: "%env(resolve:CAS_FIRSTNAME)%" - + routeDicos: "%env(resolve:ROUTE_DICOS)%" + routeSources: "%env(resolve:ROUTE_SOURCES)%" services: _defaults: diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile index 0809403..8aea7c6 100644 --- a/misc/docker/Dockerfile +++ b/misc/docker/Dockerfile @@ -28,4 +28,7 @@ RUN mkdir -p /app/var RUN chown apache /app/var -R RUN chmod u+w /app/var -R +RUN chown apache /app/misc/sample -R +RUN chmod u+w /app/misc/sample -R + CMD /app/misc/script/reconfigure.sh && /etc/apache2/apache2.sh diff --git a/misc/docker/apache.conf b/misc/docker/apache.conf index fab85b4..baa6fd5 100755 --- a/misc/docker/apache.conf +++ b/misc/docker/apache.conf @@ -1,7 +1,7 @@ LoadModule rewrite_module modules/mod_rewrite.so ServerName nineapache.local DocumentRoot "/app/public" -Alias /ninewiki /app/public +Alias /nineconfig /app/public Options Indexes FollowSymLinks AllowOverride All diff --git a/config/nineconfig/dicos.yml b/misc/sample/dicos/dicos.yml similarity index 100% rename from config/nineconfig/dicos.yml rename to misc/sample/dicos/dicos.yml diff --git a/env/.env b/misc/sample/env/.env similarity index 100% rename from env/.env rename to misc/sample/env/.env diff --git a/env/.env.local b/misc/sample/env/.env.local similarity index 63% rename from env/.env.local rename to misc/sample/env/.env.local index c5a3bbf..73581a8 100644 --- a/env/.env.local +++ b/misc/sample/env/.env.local @@ -1,5 +1,4 @@ -MODE_AUTH=SQL -KEYCLOAK_ACTIVATE=0 +APP_ENV=DEV KOMGA_ACTIVATE=1 NINECOMPTA_ACTIVATE=1 NINEFOLIO_ACTIVATE=1 diff --git a/public/medias/logo/logo.png b/public/medias/logo/logo.png index 9ac17d0..1a74a4f 100644 Binary files a/public/medias/logo/logo.png and b/public/medias/logo/logo.png differ diff --git a/src/Service/DicosService.php b/src/Service/DicosService.php index ae11e5f..d653872 100644 --- a/src/Service/DicosService.php +++ b/src/Service/DicosService.php @@ -7,16 +7,18 @@ use Symfony\Component\Yaml\Yaml; class DicosService { - private string $projectDir; + private string $routeDicos; + private string $routeSources; public function __construct(ParameterBagInterface $params) { - $this->projectDir = $params->get('kernel.project_dir'); + $this->routeDicos = $params->get('routeDicos'); + $this->routeSources = $params->get('routeSources'); } public function load(): array { - $path = $this->projectDir.'/config/nineconfig/dicos.yml'; + $path = $this->routeDicos.'/dicos.yml'; // On s'assure de disposer du dicos if (!file_exists($path)) { @@ -45,7 +47,7 @@ class DicosService // Charger les variables associƩes aux sources $results = []; foreach ($data['sources'] as $source) { - $envs = $this->parseDotEnvFile($this->projectDir.'/'.$source); + $envs = $this->parseDotEnvFile($this->routeSources.'/'.$source); foreach ($envs as $key => $value) { $results[$key] = $value; } @@ -62,7 +64,7 @@ class DicosService // Charger les variables locales associƩes aux sources foreach ($data['sources'] as $source) { - $envs = $this->parseDotEnvFile($this->projectDir.'/'.$source.'.local'); + $envs = $this->parseDotEnvFile($this->routeSources.'/'.$source.'.local'); foreach ($envs as $key => $value) { $results[$key] = $value; } @@ -86,8 +88,8 @@ class DicosService { // On supprime tt les sources local foreach ($data['sources'] as $source) { - if (file_exists($this->projectDir.'/'.$source.'.local')) { - unlink($this->projectDir.'/'.$source.'.local'); + if (file_exists($this->routeSources.'/'.$source.'.local')) { + unlink($this->routeSources.'/'.$source.'.local'); } } @@ -95,7 +97,7 @@ class DicosService foreach ($section['vars'] as $var) { if ($var['default'] != $values[$var['id']]) { dump($values[$var['id']]); - file_put_contents($this->projectDir.'/'.$var['source'].'.local', $var['id'].'='.$this->formatEnvValue($values[$var['id']]).PHP_EOL, FILE_APPEND); + file_put_contents($this->routeSources.'/'.$var['source'].'.local', $var['id'].'='.$this->formatEnvValue($values[$var['id']]).PHP_EOL, FILE_APPEND); } } }