Merge branch 'master' into PHRAS-3409-fix-prod-edit-right

docker-compose.yml

@@ -207,9 +207,6 @@ services:
     restart: on-failure
     environment:
     - STACK_NAME
-    - PHRASEANET_INSTALL
-    - PHRASEANET_SETUP
-    - PHRASEANET_UPGRADE
     - PHRASEANET_PROJECT_NAME
     - PHRASEANET_TRUSTED_PROXIES
     - PHRASEANET_DEBUG_ALLOWED_IP
@@ -222,37 +219,9 @@ services:
     - OPCACHE_ENABLED
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
-    - PHRASEANET_ADMIN_ACCOUNT_ID
-    - PHRASEANET_ADMIN_ACCOUNT_EMAIL
-    - PHRASEANET_ADMIN_ACCOUNT_PASSWORD
-    - PHRASEANET_DB_HOST
-    - PHRASEANET_DB_PORT
-    - PHRASEANET_DB_USER
-    - PHRASEANET_DB_PASSWORD
-    - INSTALL_DB_TEMPLATE
-    - INSTALL_APPBOX
-    - INSTALL_DATABOX
     - PHRASEANET_SCHEME
     - PHRASEANET_HOSTNAME
     - PHRASEANET_APP_PORT
-    - PHRASEANET_AVAILABLE_LANGUAGE
-    - PHRASEANET_DEFAULT_LANGUAGE
-    - PHRASEANET_RABBITMQ_HOST
-    - PHRASEANET_RABBITMQ_PORT
-    - PHRASEANET_RABBITMQ_SSL
-    - PHRASEANET_RABBITMQ_VHOST
-    - PHRASEANET_RABBITMQ_HEARTBEAT
-    - PHRASEANET_RABBITMQ_USER=$RABBITMQ_DEFAULT_USER
-    - PHRASEANET_RABBITMQ_PASSWORD=$RABBITMQ_DEFAULT_PASS
-    - PHRASEANET_EMITTER_EMAIL
-    - PHRASEANET_MAIL_OBJECT_PREFIX
-    - PHRASEANET_SMTP_ENABLED
-    - PHRASEANET_SMTP_HOST
-    - PHRASEANET_SMTP_PORT
-    - PHRASEANET_SMTP_AUTH_ENABLED
-    - PHRASEANET_SMTP_SECURE_MODE
-    - PHRASEANET_SMTP_USER
-    - PHRASEANET_SMTP_PASSWORD
     - PHRASEANET_DOWNLOAD_DIR
     - PHRASEANET_LAZARET_DIR
     - PHRASEANET_CAPTION_DIR
@@ -284,23 +253,6 @@ services:
     - BLACKFIRE_SERVER_TOKEN
     - SESSION_SAVE_HANDLER
     - SESSION_SAVE_PATH
-    - PHRASEANET_CACHE_TYPE
-    - PHRASEANET_CACHE_HOST
-    - PHRASEANET_CACHE_PORT
-    - PHRASEANET_ELASTICSEARCH_HOST
-    - PHRASEANET_ELASTICSEARCH_PORT
-    - PHRASEANET_ELASTICSEARCH_INDEX
-    - PHRASEANET_ELASTICSEARCH_SHARD
-    - PHRASEANET_ELASTICSEARCH_REPLICAS
-    - PHRASEANET_ELASTICSEARCH_MINSCORE
-    - PHRASEANET_ELASTICSEARCH_HIGHLIGHT
-    - PHRASEANET_ELASTICSEARCH_MAXRESULTWINDOW
-    - PHRASEANET_ELASTICSEARCH_POPULATEORDER
-    - PHRASEANET_ELASTICSEARCH_ACTIVETAB
-    - PHRASEANET_ELASTICSEARCH_FACET_BASE
-    - PHRASEANET_ELASTICSEARCH_FACET_COLLECTION
-    - PHRASEANET_ELASTICSEARCH_FACET_DOCTYPE
-    - PHRASEANET_ELASTICSEARCH_FACET_ORIENTATION
     - PHRASEANET_MAINTENANCE
 
     volumes:

docker/nginx/root/entrypoint.sh

@@ -68,6 +68,7 @@ if [[ ! -z $GATEWAY_ALLOWED_IPS ]] || [[ ! -z $GATEWAY_DENIED_IPS ]] || [[ ! -z
             echo "deny all;" >> /etc/nginx/restrictions
     fi
 fi
-
-
+unset GATEWAY_USERS
+unset GATEWAY_DENIED_IPS
+unset GATEWAY_ALLOWED_IPS
 exec "$@"

docker/phraseanet/setup/entrypoint.sh

@@ -193,9 +193,10 @@ if [[ -f "$FILE" && $PHRASEANET_SETUP = 1 ]]; then
         bin/setup system:config set -q registry.email.prefix "$PHRASEANET_MAIL_OBJECT_PREFIX"
     fi
 
-    echo `date +"%Y-%m-%d %H:%M:%S"` " - Phraseanet root account Password sync"
+    echo `date +"%Y-%m-%d %H:%M:%S"` " - Phraseanet Root account sync"
     if [[ -n ${PHRASEANET_ADMIN_ACCOUNT_ID} && $PHRASEANET_ADMIN_ACCOUNT_ID =~ ^[0-9]+$ ]]; then
-       bin/console user:password --user_id=$PHRASEANET_ADMIN_ACCOUNT_ID --password $PHRASEANET_ADMIN_ACCOUNT_PASSWORD -y
+       bin/console user:edit --user_id=$PHRASEANET_ADMIN_ACCOUNT_ID --login $PHRASEANET_ADMIN_ACCOUNT_EMAIL --email $PHRASEANET_ADMIN_ACCOUNT_EMAIL --password $PHRASEANET_ADMIN_ACCOUNT_PASSWORD -y
+       echo `date +"%Y-%m-%d %H:%M:%S"` " - Phraseanet Root account synced"
     fi
 
     echo `date +"%Y-%m-%d %H:%M:%S"` " - config/configuration.yml update by Phraseanet entrypoint.sh Finished !"
@@ -234,7 +235,6 @@ chown -R app:app www
 
 echo `date +"%Y-%m-%d %H:%M:%S"` " - End of chown!"   
 
-
 echo `date +"%Y-%m-%d %H:%M:%S"` " - End of Phraseanet setup entrypoint.sh"
 
 if [[ $PHRASEANET_MAINTENANCE = 2 ]];then

docker/phraseanet/setup/init-test-install.sh

@@ -8,33 +8,21 @@ php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer
 
 composer install --ignore-platform-reqs --no-interaction
 
-
-
-if [ -z "$PHRASEANET_ADMIN_ACCOUNT_EMAIL" ]; then
-    echo "PHRASEANET_ADMIN_ACCOUNT_EMAIL, Phraseanet admin account  var is not set."
-    exit 1
-fi
-
-if [ -z "$PHRASEANET_ADMIN_ACCOUNT_PASSWORD " ]; then
-    echo "$PHRASEANET_ADMIN_ACCOUNT_PASSWORD,  Phaseanet admin password var is not set."
-    exit 1
-fi
-
 FILE=config/configuration.yml
 
 while [[ ! -e "$FILE" ]]
 do
 sleep 10
 /var/alchemy/Phraseanet/bin/setup system:install \
-    --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 \
+    --email=[email protected] \
+    --password=test \
+    --db-host=db \
+    --db-port=3306 \
+    --db-user=root \
+    --db-password=root \
+    --db-template=DublinCore \
+    --appbox=ab_master \
+    --databox=db_databox1 \
     --server-name=$PHRASEANET_BASE_URL \
     --download-path=$PHRASEANET_DOWNLOAD_DIR \
     --lazaret-path=$PHRASEANET_LAZARET_DIR \