Skip to content

Commit

Permalink
Merge pull request #135 from PrestaShop/avoid-chown-whole-project
Browse files Browse the repository at this point in the history 
Avoid chown on the whole project when installation is requested
  • Loading branch information
@Quetzacoalt91
Quetzacoalt91 committed Sep 12, 2018
2 parents 85482bf + b274f18 commit 9eeb52e
Show file tree
Hide file tree
Showing 34 changed files with 153 additions and 85 deletions.
11 changes: 7 additions & 4 deletions base/config_files/docker_run.sh
View file
Expand Up @@ -10,7 +10,7 @@ if [ ! -f ./config/settings.inc.php ]; then
echo "\n* Reapplying PrestaShop files for enabled volumes ...";

# init if empty
cp -n -R /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html

if [ $PS_DEV_MODE -ne 0 ]; then
echo "\n* Enabling DEV mode ...";
Expand Down Expand Up @@ -64,13 +64,16 @@ if [ ! -f ./config/settings.inc.php ]; then
export PS_DOMAIN=$(hostname -i)
fi

php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php --domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
runuser -g www-data -u www-data -- php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php \
--domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
--db_password=$DB_PASSWD --prefix="$DB_PREFIX" --firstname="John" --lastname="Doe" \
--password=$ADMIN_PASSWD --email="$ADMIN_MAIL" --language=$PS_LANGUAGE --country=$PS_COUNTRY \
--newsletter=0 --send_email=0
fi

chown www-data:www-data -R /var/www/html/
if [ $? -ne 0 ]; then
echo 'warning: PrestaShop installation failed.'
fi
fi
else
echo "\n* Pretashop Core already installed...";
fi
Expand Down
3 changes: 2 additions & 1 deletion base/config_files/ps-extractor.sh
View file
Expand Up @@ -10,7 +10,8 @@ if [[ -n "$folder" ]]; then
rm -rf $folder/prestashop.zip
fi

cp -n -R $folder/prestashop/* /var/www/html
chown www-data:www-data -R $folder/prestashop/
cp -n -R -p $folder/prestashop/* /var/www/html
else
echo "Missing folder to move"
fi
11 changes: 7 additions & 4 deletions base/images/5-apache/config_files/docker_run.sh
View file
Expand Up @@ -10,7 +10,7 @@ if [ ! -f ./config/settings.inc.php ]; then
echo "\n* Reapplying PrestaShop files for enabled volumes ...";

# init if empty
cp -n -R /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html

if [ $PS_DEV_MODE -ne 0 ]; then
echo "\n* Enabling DEV mode ...";
Expand Down Expand Up @@ -64,13 +64,16 @@ if [ ! -f ./config/settings.inc.php ]; then
export PS_DOMAIN=$(hostname -i)
fi

php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php --domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
runuser -g www-data -u www-data -- php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php \
--domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
--db_password=$DB_PASSWD --prefix="$DB_PREFIX" --firstname="John" --lastname="Doe" \
--password=$ADMIN_PASSWD --email="$ADMIN_MAIL" --language=$PS_LANGUAGE --country=$PS_COUNTRY \
--newsletter=0 --send_email=0
fi

chown www-data:www-data -R /var/www/html/
if [ $? -ne 0 ]; then
echo 'warning: PrestaShop installation failed.'
fi
fi
else
echo "\n* Pretashop Core already installed...";
fi
Expand Down
3 changes: 2 additions & 1 deletion base/images/5-apache/config_files/ps-extractor.sh
View file
Expand Up @@ -10,7 +10,8 @@ if [[ -n "$folder" ]]; then
rm -rf $folder/prestashop.zip
fi

cp -n -R $folder/prestashop/* /var/www/html
chown www-data:www-data -R $folder/prestashop/
cp -n -R -p $folder/prestashop/* /var/www/html
else
echo "Missing folder to move"
fi
11 changes: 7 additions & 4 deletions base/images/5-fpm/config_files/docker_run.sh
View file
Expand Up @@ -10,7 +10,7 @@ if [ ! -f ./config/settings.inc.php ]; then
echo "\n* Reapplying PrestaShop files for enabled volumes ...";

# init if empty
cp -n -R /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html

if [ $PS_DEV_MODE -ne 0 ]; then
echo "\n* Enabling DEV mode ...";
Expand Down Expand Up @@ -64,13 +64,16 @@ if [ ! -f ./config/settings.inc.php ]; then
export PS_DOMAIN=$(hostname -i)
fi

php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php --domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
runuser -g www-data -u www-data -- php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php \
--domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
--db_password=$DB_PASSWD --prefix="$DB_PREFIX" --firstname="John" --lastname="Doe" \
--password=$ADMIN_PASSWD --email="$ADMIN_MAIL" --language=$PS_LANGUAGE --country=$PS_COUNTRY \
--newsletter=0 --send_email=0
fi

chown www-data:www-data -R /var/www/html/
if [ $? -ne 0 ]; then
echo 'warning: PrestaShop installation failed.'
fi
fi
else
echo "\n* Pretashop Core already installed...";
fi
Expand Down
3 changes: 2 additions & 1 deletion base/images/5-fpm/config_files/ps-extractor.sh
View file
Expand Up @@ -10,7 +10,8 @@ if [[ -n "$folder" ]]; then
rm -rf $folder/prestashop.zip
fi

cp -n -R $folder/prestashop/* /var/www/html
chown www-data:www-data -R $folder/prestashop/
cp -n -R -p $folder/prestashop/* /var/www/html
else
echo "Missing folder to move"
fi
11 changes: 7 additions & 4 deletions base/images/5.5-apache/config_files/docker_run.sh
View file
Expand Up @@ -10,7 +10,7 @@ if [ ! -f ./config/settings.inc.php ]; then
echo "\n* Reapplying PrestaShop files for enabled volumes ...";

# init if empty
cp -n -R /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html

if [ $PS_DEV_MODE -ne 0 ]; then
echo "\n* Enabling DEV mode ...";
Expand Down Expand Up @@ -64,13 +64,16 @@ if [ ! -f ./config/settings.inc.php ]; then
export PS_DOMAIN=$(hostname -i)
fi

php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php --domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
runuser -g www-data -u www-data -- php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php \
--domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
--db_password=$DB_PASSWD --prefix="$DB_PREFIX" --firstname="John" --lastname="Doe" \
--password=$ADMIN_PASSWD --email="$ADMIN_MAIL" --language=$PS_LANGUAGE --country=$PS_COUNTRY \
--newsletter=0 --send_email=0
fi

chown www-data:www-data -R /var/www/html/
if [ $? -ne 0 ]; then
echo 'warning: PrestaShop installation failed.'
fi
fi
else
echo "\n* Pretashop Core already installed...";
fi
Expand Down
3 changes: 2 additions & 1 deletion base/images/5.5-apache/config_files/ps-extractor.sh
View file
Expand Up @@ -10,7 +10,8 @@ if [[ -n "$folder" ]]; then
rm -rf $folder/prestashop.zip
fi

cp -n -R $folder/prestashop/* /var/www/html
chown www-data:www-data -R $folder/prestashop/
cp -n -R -p $folder/prestashop/* /var/www/html
else
echo "Missing folder to move"
fi
11 changes: 7 additions & 4 deletions base/images/5.5-fpm/config_files/docker_run.sh
View file
Expand Up @@ -10,7 +10,7 @@ if [ ! -f ./config/settings.inc.php ]; then
echo "\n* Reapplying PrestaShop files for enabled volumes ...";

# init if empty
cp -n -R /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html

if [ $PS_DEV_MODE -ne 0 ]; then
echo "\n* Enabling DEV mode ...";
Expand Down Expand Up @@ -64,13 +64,16 @@ if [ ! -f ./config/settings.inc.php ]; then
export PS_DOMAIN=$(hostname -i)
fi

php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php --domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
runuser -g www-data -u www-data -- php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php \
--domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
--db_password=$DB_PASSWD --prefix="$DB_PREFIX" --firstname="John" --lastname="Doe" \
--password=$ADMIN_PASSWD --email="$ADMIN_MAIL" --language=$PS_LANGUAGE --country=$PS_COUNTRY \
--newsletter=0 --send_email=0
fi

chown www-data:www-data -R /var/www/html/
if [ $? -ne 0 ]; then
echo 'warning: PrestaShop installation failed.'
fi
fi
else
echo "\n* Pretashop Core already installed...";
fi
Expand Down
3 changes: 2 additions & 1 deletion base/images/5.5-fpm/config_files/ps-extractor.sh
View file
Expand Up @@ -10,7 +10,8 @@ if [[ -n "$folder" ]]; then
rm -rf $folder/prestashop.zip
fi

cp -n -R $folder/prestashop/* /var/www/html
chown www-data:www-data -R $folder/prestashop/
cp -n -R -p $folder/prestashop/* /var/www/html
else
echo "Missing folder to move"
fi
11 changes: 7 additions & 4 deletions base/images/5.6-apache/config_files/docker_run.sh
View file
Expand Up @@ -10,7 +10,7 @@ if [ ! -f ./config/settings.inc.php ]; then
echo "\n* Reapplying PrestaShop files for enabled volumes ...";

# init if empty
cp -n -R /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html

if [ $PS_DEV_MODE -ne 0 ]; then
echo "\n* Enabling DEV mode ...";
Expand Down Expand Up @@ -64,13 +64,16 @@ if [ ! -f ./config/settings.inc.php ]; then
export PS_DOMAIN=$(hostname -i)
fi

php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php --domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
runuser -g www-data -u www-data -- php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php \
--domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
--db_password=$DB_PASSWD --prefix="$DB_PREFIX" --firstname="John" --lastname="Doe" \
--password=$ADMIN_PASSWD --email="$ADMIN_MAIL" --language=$PS_LANGUAGE --country=$PS_COUNTRY \
--newsletter=0 --send_email=0
fi

chown www-data:www-data -R /var/www/html/
if [ $? -ne 0 ]; then
echo 'warning: PrestaShop installation failed.'
fi
fi
else
echo "\n* Pretashop Core already installed...";
fi
Expand Down
3 changes: 2 additions & 1 deletion base/images/5.6-apache/config_files/ps-extractor.sh
View file
Expand Up @@ -10,7 +10,8 @@ if [[ -n "$folder" ]]; then
rm -rf $folder/prestashop.zip
fi

cp -n -R $folder/prestashop/* /var/www/html
chown www-data:www-data -R $folder/prestashop/
cp -n -R -p $folder/prestashop/* /var/www/html
else
echo "Missing folder to move"
fi
11 changes: 7 additions & 4 deletions base/images/5.6-fpm/config_files/docker_run.sh
View file
Expand Up @@ -10,7 +10,7 @@ if [ ! -f ./config/settings.inc.php ]; then
echo "\n* Reapplying PrestaShop files for enabled volumes ...";

# init if empty
cp -n -R /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html

if [ $PS_DEV_MODE -ne 0 ]; then
echo "\n* Enabling DEV mode ...";
Expand Down Expand Up @@ -64,13 +64,16 @@ if [ ! -f ./config/settings.inc.php ]; then
export PS_DOMAIN=$(hostname -i)
fi

php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php --domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
runuser -g www-data -u www-data -- php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php \
--domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
--db_password=$DB_PASSWD --prefix="$DB_PREFIX" --firstname="John" --lastname="Doe" \
--password=$ADMIN_PASSWD --email="$ADMIN_MAIL" --language=$PS_LANGUAGE --country=$PS_COUNTRY \
--newsletter=0 --send_email=0
fi

chown www-data:www-data -R /var/www/html/
if [ $? -ne 0 ]; then
echo 'warning: PrestaShop installation failed.'
fi
fi
else
echo "\n* Pretashop Core already installed...";
fi
Expand Down
3 changes: 2 additions & 1 deletion base/images/5.6-fpm/config_files/ps-extractor.sh
View file
Expand Up @@ -10,7 +10,8 @@ if [[ -n "$folder" ]]; then
rm -rf $folder/prestashop.zip
fi

cp -n -R $folder/prestashop/* /var/www/html
chown www-data:www-data -R $folder/prestashop/
cp -n -R -p $folder/prestashop/* /var/www/html
else
echo "Missing folder to move"
fi
11 changes: 7 additions & 4 deletions base/images/7-apache/config_files/docker_run.sh
View file
Expand Up @@ -10,7 +10,7 @@ if [ ! -f ./config/settings.inc.php ]; then
echo "\n* Reapplying PrestaShop files for enabled volumes ...";

# init if empty
cp -n -R /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html

if [ $PS_DEV_MODE -ne 0 ]; then
echo "\n* Enabling DEV mode ...";
Expand Down Expand Up @@ -64,13 +64,16 @@ if [ ! -f ./config/settings.inc.php ]; then
export PS_DOMAIN=$(hostname -i)
fi

php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php --domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
runuser -g www-data -u www-data -- php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php \
--domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
--db_password=$DB_PASSWD --prefix="$DB_PREFIX" --firstname="John" --lastname="Doe" \
--password=$ADMIN_PASSWD --email="$ADMIN_MAIL" --language=$PS_LANGUAGE --country=$PS_COUNTRY \
--newsletter=0 --send_email=0
fi

chown www-data:www-data -R /var/www/html/
if [ $? -ne 0 ]; then
echo 'warning: PrestaShop installation failed.'
fi
fi
else
echo "\n* Pretashop Core already installed...";
fi
Expand Down
3 changes: 2 additions & 1 deletion base/images/7-apache/config_files/ps-extractor.sh
View file
Expand Up @@ -10,7 +10,8 @@ if [[ -n "$folder" ]]; then
rm -rf $folder/prestashop.zip
fi

cp -n -R $folder/prestashop/* /var/www/html
chown www-data:www-data -R $folder/prestashop/
cp -n -R -p $folder/prestashop/* /var/www/html
else
echo "Missing folder to move"
fi
11 changes: 7 additions & 4 deletions base/images/7-fpm/config_files/docker_run.sh
View file
Expand Up @@ -10,7 +10,7 @@ if [ ! -f ./config/settings.inc.php ]; then
echo "\n* Reapplying PrestaShop files for enabled volumes ...";

# init if empty
cp -n -R /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html

if [ $PS_DEV_MODE -ne 0 ]; then
echo "\n* Enabling DEV mode ...";
Expand Down Expand Up @@ -64,13 +64,16 @@ if [ ! -f ./config/settings.inc.php ]; then
export PS_DOMAIN=$(hostname -i)
fi

php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php --domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
runuser -g www-data -u www-data -- php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php \
--domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
--db_password=$DB_PASSWD --prefix="$DB_PREFIX" --firstname="John" --lastname="Doe" \
--password=$ADMIN_PASSWD --email="$ADMIN_MAIL" --language=$PS_LANGUAGE --country=$PS_COUNTRY \
--newsletter=0 --send_email=0
fi

chown www-data:www-data -R /var/www/html/
if [ $? -ne 0 ]; then
echo 'warning: PrestaShop installation failed.'
fi
fi
else
echo "\n* Pretashop Core already installed...";
fi
Expand Down
3 changes: 2 additions & 1 deletion base/images/7-fpm/config_files/ps-extractor.sh
View file
Expand Up @@ -10,7 +10,8 @@ if [[ -n "$folder" ]]; then
rm -rf $folder/prestashop.zip
fi

cp -n -R $folder/prestashop/* /var/www/html
chown www-data:www-data -R $folder/prestashop/
cp -n -R -p $folder/prestashop/* /var/www/html
else
echo "Missing folder to move"
fi
11 changes: 7 additions & 4 deletions base/images/7.0-apache/config_files/docker_run.sh
View file
Expand Up @@ -10,7 +10,7 @@ if [ ! -f ./config/settings.inc.php ]; then
echo "\n* Reapplying PrestaShop files for enabled volumes ...";

# init if empty
cp -n -R /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html

if [ $PS_DEV_MODE -ne 0 ]; then
echo "\n* Enabling DEV mode ...";
Expand Down Expand Up @@ -64,13 +64,16 @@ if [ ! -f ./config/settings.inc.php ]; then
export PS_DOMAIN=$(hostname -i)
fi

php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php --domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
runuser -g www-data -u www-data -- php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php \
--domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
--db_password=$DB_PASSWD --prefix="$DB_PREFIX" --firstname="John" --lastname="Doe" \
--password=$ADMIN_PASSWD --email="$ADMIN_MAIL" --language=$PS_LANGUAGE --country=$PS_COUNTRY \
--newsletter=0 --send_email=0
fi

chown www-data:www-data -R /var/www/html/
if [ $? -ne 0 ]; then
echo 'warning: PrestaShop installation failed.'
fi
fi
else
echo "\n* Pretashop Core already installed...";
fi
Expand Down
3 changes: 2 additions & 1 deletion base/images/7.0-apache/config_files/ps-extractor.sh
View file
Expand Up @@ -10,7 +10,8 @@ if [[ -n "$folder" ]]; then
rm -rf $folder/prestashop.zip
fi

cp -n -R $folder/prestashop/* /var/www/html
chown www-data:www-data -R $folder/prestashop/
cp -n -R -p $folder/prestashop/* /var/www/html
else
echo "Missing folder to move"
fi

0 comments on commit 9eeb52e

Please sign in to comment.