diff --git a/.env b/.env index a6491fa9d2..936666fc89 100644 --- a/.env +++ b/.env @@ -34,17 +34,17 @@ PHP_LOG_LEVEL=warning # These variables are only used if the configuration.yml file is not present, in order to automate the installation procedure # set here the first user / email couple -INSTALL_ACCOUNT_EMAIL=admin@alchemy.fr -INSTALL_ACCOUNT_PASSWORD=iJRqXU0MwbyJewQLBbra6IWHsWly +PHRASEANET_ADMIN_ACCOUNT_EMAIL=admin@alchemy.fr +PHRASEANET_ADMIN_ACCOUNT_PASSWORD=iJRqXU0MwbyJewQLBbra6IWHsWly # Database parameters -INSTALL_DB_HOST=db -INSTALL_DB_PORT=3306 -INSTALL_DB_USER=root -INSTALL_DB_PASSWORD=root +PHRASEANET_DB_HOST=db +PHRASEANET_DB_PORT=3306 +PHRASEANET_DB_USER=root +PHRASEANET_DB_PASSWORD=root INSTALL_DB_TEMPLATE=DublinCore INSTALL_APPBOX=ab_master INSTALL_DATABOX=db_databox1 -INSTALL_SERVER_NAME=localhost +PHRASEANET_SERVER_NAME=localhost # Mysql max allowed packet MYSQL_MAX_ALLOWED_PACKET=16M diff --git a/docker/phraseanet/auto-install.sh b/docker/phraseanet/auto-install.sh index 894bba3e84..b8b54348a0 100755 --- a/docker/phraseanet/auto-install.sh +++ b/docker/phraseanet/auto-install.sh @@ -13,24 +13,20 @@ if [ -z "$INSTALL_ACCOUNT_PASSWORD" ]; then fi /var/alchemy/Phraseanet/bin/setup system:install \ - --email=$INSTALL_ACCOUNT_EMAIL \ - --password=$INSTALL_ACCOUNT_PASSWORD \ - --db-host=$INSTALL_DB_HOST \ - --db-port=$INSTALL_DB_PORT \ - --db-user=$INSTALL_DB_USER \ - --db-password=$INSTALL_DB_PASSWORD \ + --email=$PHRASEANET_ADMIN_ACCOUNT_EMAIL \ + --password=$PHRASEANET_ADMIN_ACCOUNT_PASSWORD \ + --db-host=$PHRASEANET_DB_HOST \ + --db-port=$PHRASEANET_DB_PORT \ + --db-user=$PHRASEANET_DB_USER \ + --db-password=$PHRASEANET_DB_PASSWORD \ --db-template=$INSTALL_DB_TEMPLATE \ --appbox=$INSTALL_APPBOX \ --databox=$INSTALL_DATABOX \ - --server-name=$INSTALL_SERVER_NAME \ + --server-name=$PHRASEANET_SERVER_NAME \ --download-path=$PHRASEANET_DOWNLOAD_DIR \ --lazaret-path=$PHRASEANET_LAZARET_DIR \ --caption-path=$PHRASEANET_CAPTION_DIR \ --worker-tmp-files=$PHRASEANET_WORKER_TMP \ - --download-path=/var/alchemy/Phraseanet/datas/download \ - --lazaret-path=/var/alchemy/Phraseanet/datas/lazaret \ - --caption-path=/var/alchemy/Phraseanet/tmp/caption \ - --worker-tmp-files=/var/alchemy/Phraseanet/tmp \ --data-path=/var/alchemy/Phraseanet/datas -y # Bus configuration for scheduler & worker diff --git a/docker/phraseanet/entrypoint.sh b/docker/phraseanet/entrypoint.sh index f98d0f9d24..536b6ec7ad 100755 --- a/docker/phraseanet/entrypoint.sh +++ b/docker/phraseanet/entrypoint.sh @@ -31,6 +31,7 @@ if [ -f "$FILE" ]; then bin/setup system:config set registry.email.emitter-email $PHRASEANET_EMITTER_EMAIL bin/setup system:config set registry.email.prefix $PHRASEANET_MAIL_OBJECT_PREFIX fi + bin/console user:password --user_id=1 --password=$PHRASEANET_ADMIN_ACCOUNT_PASSWORD else echo "$FILE doesn't exist, entering setup..." runuser app -c docker/phraseanet/auto-install.sh