diff --git a/.gitignore b/.gitignore index 1006d15..5f57937 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,23 @@ 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-ninegate/volume/data/private/* !/services/50-ninegate/volume/data/private/.gitkeep diff --git a/env/.env b/env/.env index 39508af..abc2abf 100644 --- a/env/.env +++ b/env/.env @@ -45,14 +45,14 @@ MTA_RELAY_USER="user" # DEBUGING MTA # fake-smtp server -FAKE_SMTP_NAME=fakesmtp -FAKE_SMTP_LOCAL=1 -FAKE_SMTP_ACTIVATE=1 +FAKESMTP_SERVICE_NAME=fakesmtp +FAKESMTP_LOCAL=1 +FAKESMTP_ACTIVATE=1 # si actif, il faut sans doute l’utiliser # comme passerelle pour le service MTA -if [ "$FAKE_SMTP_ACTIVATE" -eq 1 ] +if [ "$FAKESMTP_ACTIVATE" -eq 1 ] then - MTA_RELAY_HOST="$FAKE_SMTP_NAME" + MTA_RELAY_HOST="$FAKESMTP_NAME" MTA_RELAY_PORT=2525 fi diff --git a/services/50-ninefolio/dockercompose/dockercompose.yml b/services/50-ninefolio/dockercompose/dockercompose.yml index 52b86e4..b2e8773 100644 --- a/services/50-ninefolio/dockercompose/dockercompose.yml +++ b/services/50-ninefolio/dockercompose/dockercompose.yml @@ -1,4 +1,4 @@ - +services: # ninefolio # Portail collaboratif # Port interne 80 @@ -12,3 +12,5 @@ volumes: - ./services/50-ninefolio/volume/data/private:/app/uploads - ./services/50-ninefolio/volume/data/public:/app/public/uploads + - ./services/50-ninefolio/volume/data/build:/app/public/build + diff --git a/services/50-ninefolio/env/.env b/services/50-ninefolio/env/.env index d1382fd..b9274e3 100644 --- a/services/50-ninefolio/env/.env +++ b/services/50-ninefolio/env/.env @@ -1,11 +1,15 @@ # == NINEFOLIO ============================================================================================================================= + # BASIC APP_ALIAS=ninefolio APP_NAME="NINEFOLIO" APP_CRON=1 +# Webpack +APP_PUBLIC_PATH=/${APP_ALIAS}/build +APP_MANIFEST_KEY_PREFIX=${APP_ALIAS} # BDD DATABASE_NAME=${NINEFOLIO_SERVICE_NAME} diff --git a/services/50-ninefolio/volume/data/public/image/contact.jpg b/services/50-ninefolio/volume/data/public/image/contact.jpg new file mode 100644 index 0000000..fdbc7fc Binary files /dev/null and b/services/50-ninefolio/volume/data/public/image/contact.jpg differ diff --git a/services/50-ninefolio/volume/data/public/image/link.jpg b/services/50-ninefolio/volume/data/public/image/link.jpg new file mode 100644 index 0000000..e55f312 Binary files /dev/null and b/services/50-ninefolio/volume/data/public/image/link.jpg differ diff --git a/services/50-nineskeletor/dockercompose/dockercompose.yml b/services/50-nineskeletor/dockercompose/dockercompose.yml index d4e7d0c..9687b11 100644 --- a/services/50-nineskeletor/dockercompose/dockercompose.yml +++ b/services/50-nineskeletor/dockercompose/dockercompose.yml @@ -12,4 +12,4 @@ services: 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 + - ./services/50-nineskeletor/volume/data/public:/app/public/uploads \ No newline at end of file diff --git a/services/90-fakesmtp/dockercompose/dockercompose.yml b/services/90-fakesmtp/dockercompose/dockercompose.yml index e0c3668..b856d30 100644 --- a/services/90-fakesmtp/dockercompose/dockercompose.yml +++ b/services/90-fakesmtp/dockercompose/dockercompose.yml @@ -8,4 +8,4 @@ services: networks: - nine-network ports: - - "8080:8080" + - "6080:8080" diff --git a/services/90-fakesmtp/misc/nine.sh b/services/90-fakesmtp/misc/nine.sh index 9db375d..5ea2961 100644 --- a/services/90-fakesmtp/misc/nine.sh +++ b/services/90-fakesmtp/misc/nine.sh @@ -1,22 +1,22 @@ #!/bin/bash function upfakesmtp { - if [[ $FAKE_SMTP_ACTIVATE == 1 && $FAKE_SMTP_LOCAL == 1 ]] + if [[ $FAKESMTP_ACTIVATE == 1 && $FAKESMTP_LOCAL == 1 ]] then - Title ${FAKE_SMTP_NAME^^} + Title ${FAKESMTP_SERVICE_NAME^^} EchoVert "CONTAINER" - upservice ${FAKE_SMTP_NAME} + upservice ${FAKESMTP_SERVICE_NAME} Echo fi } function destroyfakesmtp { - if [[ $FAKE_SMTP_LOCAL == 1 ]] + if [[ $FAKESMTP_LOCAL == 1 ]] then - Title "DESTROY ${FAKE_SMTP_NAME}" + Title "DESTROY ${FAKESMTP_SERVICE_NAME}" - stop ${FAKE_SMTP_NAME} 1 - docker-compose rm -s -v -f "${FAKE_SMTP_NAME}" + stop ${FAKESMTP_SERVICE_NAME} 1 + docker-compose rm -s -v -f "${FAKESMTP_SERVICE_NAME}" echo "" fi }