Merge branch 'use-preparestatic' into 'versions/next'

Switch to preparestatic (Closes: #593)

See merge request mayan-edms/mayan-edms!48
This commit is contained in:
Roberto Rosario
2019-05-25 00:11:09 +00:00
6 changed files with 8 additions and 8 deletions

View File

@@ -1445,7 +1445,7 @@ sudo -u mayan \
dialog --infobox "Preparing static files" 3 70
sudo -u mayan \
MAYAN_MEDIA_ROOT=$MAYAN_MEDIA_ROOT \
$MAYAN_BIN collectstatic --noinput > /dev/null
$MAYAN_BIN preparestatic --noinput > /dev/null
# Create supervisor file for gunicorn (frontend), 3 background workers, and the scheduler for periodic tasks
cat > /etc/supervisor/conf.d/mayan.conf <<EOF

View File

@@ -161,7 +161,7 @@ priority = 998
EOF
echo -e "\n -> Collecting the static files \n"
mayan-edms.py collectstatic --noinput
mayan-edms.py preparestatic --noinput
echo -e "\n -> Making the installation directory readable and writable by the webserver user \n"
chown www-data:www-data ${INSTALLATION_DIRECTORY} -R

View File

@@ -55,13 +55,13 @@ chown mayan:mayan /var/lib/mayan -R
initialize() {
echo "mayan: initialize()"
su mayan -c "${MAYAN_BIN} initialsetup --force"
su mayan -c "${MAYAN_BIN} collectstatic --noinput --clear"
su mayan -c "${MAYAN_BIN} preparestatic --noinput --clear"
}
upgrade() {
echo "mayan: upgrade()"
su mayan -c "${MAYAN_BIN} performupgrade"
su mayan -c "${MAYAN_BIN} collectstatic --noinput --clear"
su mayan -c "${MAYAN_BIN} preparestatic --noinput --clear"
}
start() {

View File

@@ -82,7 +82,7 @@ Collect the static files:
::
sudo -u mayan MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
/opt/mayan-edms/bin/mayan-edms.py collectstatic --noinput
/opt/mayan-edms/bin/mayan-edms.py preparestatic --noinput
Create the supervisor file at ``/etc/supervisor/conf.d/mayan.conf``:
--------------------------------------------------------------------
@@ -244,7 +244,7 @@ Collect the static files:
::
sudo -u mayan MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
/opt/mayan-edms/bin/mayan-edms.py collectstatic --noinput
/opt/mayan-edms/bin/mayan-edms.py preparestatic --noinput
Create the RabbitMQ user and vhost:
-----------------------------------

View File

@@ -81,7 +81,7 @@ Migrate existing database schema with::
Add new static media::
$ mayan-edms.py collectstatic --noinput
$ mayan-edms.py preparestatic --noinput
The upgrade procedure is now complete.

View File

@@ -185,7 +185,7 @@ Django's development server doesn't serve static files unless the DEBUG option
is set to True, this mode of operation should only be used for development or
testing. For production deployments the management command::
$ mayan-edms.py collectstatic
$ mayan-edms.py preparestatic
should be used and the resulting static folder served from a webserver.
For more information check the