diff --git a/.gitignore b/.gitignore index 5f57937..a38e987 100644 --- a/.gitignore +++ b/.gitignore @@ -29,23 +29,8 @@ docker-compose.yml /services/50-nineboard/volume/data/public/logo/* !/services/50-nineboard/volume/data/public/logo/logo.png -/services/50-ninefolio/volume/data/build -/services/50-ninefolio/volume/data/private/* -!/services/50-ninefolio/volume/data/private/.gitkeep -!/services/50-ninefolio/volume/data/public/avatar -/services/50-ninefolio/volume/data/public/avatar/* -!/services/50-ninefolio/volume/data/public/avatar/admin.jpg -!/services/50-ninefolio/volume/data/public/avatar/noavatar.png -!/services/50-ninefolio/volume/data/public/avatar/system.jpg -!/services/50-ninefolio/volume/data/public/logo -/services/50-ninefolio/volume/data/public/logo/* -!/services/50-ninefolio/volume/data/public/logo/logo.png -!/services/50-ninefolio/volume/data/public/hero -/services/50-ninefolio/volume/data/public/hero/* -!/services/50-ninefolio/volume/data/public/hero/hero.jpg -/services/50-ninefolio/volume/data/public/image/* -!/services/50-ninefolio/volume/data/public/image/contact.jpg -!/services/50-ninefolio/volume/data/public/image/link.jpg +/services/50-ninefolio/volume/data +/services/50-ninefolio/volume/apache /services/50-ninegate/volume/data/private/* !/services/50-ninegate/volume/data/private/.gitkeep diff --git a/misc/tools/dicos.sh b/misc/tools/dicos.sh index 820c585..cca4bb5 100755 --- a/misc/tools/dicos.sh +++ b/misc/tools/dicos.sh @@ -1,10 +1,13 @@ dir=$1 if [ -f "$dir/dicos/.env.dicos" ]; then + + echo $dir + dicos="$dir/dicos/.env.dicos" # Exporter la variable - export $(grep -v '^#' $dir/env/.env.merge 2>/dev/null| xargs) + set -o allexport; source <(grep -v '^#' $dir/env/.env.merge | sed 's/^/export /'); set +o allexport # Initialisation des tableaux templates=() diff --git a/services/50-nineskeletor/dicos/.env.dicos b/services/50-nineskeletor/dicos/.env.dicos deleted file mode 100644 index 4479058..0000000 --- a/services/50-nineskeletor/dicos/.env.dicos +++ /dev/null @@ -1,2 +0,0 @@ -templates=services/50-nineskeletor/tmpl/nineskeletor.conf,services/50-nineskeletor/tmpl/nineapache.conf -destinations=services/50-nineskeletor/volume/apache/nineskeletor.conf,services/10-nineapache/volume/apache/50-nineskeletor.conf diff --git a/services/50-nineskeletor/dockercompose/dockercompose.yml b/services/50-nineskeletor/dockercompose/dockercompose.yml index 9687b11..98b8126 100644 --- a/services/50-nineskeletor/dockercompose/dockercompose.yml +++ b/services/50-nineskeletor/dockercompose/dockercompose.yml @@ -10,6 +10,5 @@ services: networks: - nine-network volumes: - - ./services/50-nineskeletor/volume/apache:/etc/apache2/conf.d/nine - ./services/50-nineskeletor/volume/data/private:/app/uploads - ./services/50-nineskeletor/volume/data/public:/app/public/uploads \ No newline at end of file diff --git a/services/50-nineskeletor/tmpl/nineapache.conf b/services/50-nineskeletor/tmpl/nineapache.conf deleted file mode 100644 index 6ea82f0..0000000 --- a/services/50-nineskeletor/tmpl/nineapache.conf +++ /dev/null @@ -1,5 +0,0 @@ - -# nineskeletor -ProxyPass /${NINESKELETOR_PREFIX} http://nineskeletor/${NINESKELETOR_PREFIX} retry=0 keepalive=On -ProxyPassReverse /${NINESKELETOR_PREFIX} http://nineskeletor/${NINESKELETOR_PREFIX} retry=0 - diff --git a/services/50-nineskeletor/tmpl/nineskeletor.conf b/services/50-nineskeletor/tmpl/nineskeletor.conf deleted file mode 100644 index 0ee5673..0000000 --- a/services/50-nineskeletor/tmpl/nineskeletor.conf +++ /dev/null @@ -1,19 +0,0 @@ -LoadModule rewrite_module modules/mod_rewrite.so -ServerName nineapache.local -DocumentRoot "/app/public" -Alias /${NINESKELETOR_PREFIX} /app/public - - Options Indexes FollowSymLinks - AllowOverride All - Require all granted - - RewriteEngine On - RewriteCond %{REQUEST_URI}::$0 ^(/.+)/(.*)::\2$ - RewriteRule .* - [E=BASE:%1] - RewriteCond %{HTTP:Authorization} .+ - RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0] - RewriteCond %{ENV:REDIRECT_STATUS} ="" - RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L] - RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^ %{ENV:BASE}/index.php [L] - \ No newline at end of file