diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
commit | eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch) | |
tree | ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /www-apps/netbox/files | |
parent | b7ebc951da8800f711142f69d9d958bde67a112d (diff) |
gentoo resync : 04.05.2019
Diffstat (limited to 'www-apps/netbox/files')
-rw-r--r-- | www-apps/netbox/files/netbox-2.5.11-no-pip.patch (renamed from www-apps/netbox/files/netbox-2.5.10-no-pip.patch) | 0 | ||||
-rw-r--r-- | www-apps/netbox/files/netbox-2.5.12-no-pip.patch | 27 | ||||
-rw-r--r-- | www-apps/netbox/files/netbox-rqworker.initd | 2 | ||||
-rw-r--r-- | www-apps/netbox/files/netbox.initd | 2 |
4 files changed, 31 insertions, 0 deletions
diff --git a/www-apps/netbox/files/netbox-2.5.10-no-pip.patch b/www-apps/netbox/files/netbox-2.5.11-no-pip.patch index 5d1fa595f4e6..5d1fa595f4e6 100644 --- a/www-apps/netbox/files/netbox-2.5.10-no-pip.patch +++ b/www-apps/netbox/files/netbox-2.5.11-no-pip.patch diff --git a/www-apps/netbox/files/netbox-2.5.12-no-pip.patch b/www-apps/netbox/files/netbox-2.5.12-no-pip.patch new file mode 100644 index 000000000000..5d1fa595f4e6 --- /dev/null +++ b/www-apps/netbox/files/netbox-2.5.12-no-pip.patch @@ -0,0 +1,27 @@ +diff --git a/upgrade.sh b/upgrade.sh +index 24e79f5b..248e1cb5 100755 +--- a/upgrade.sh ++++ b/upgrade.sh +@@ -8,22 +8,6 @@ + PYTHON="python3" + PIP="pip3" + +-# TODO: Remove this in v2.6 as it is no longer needed under Python 3 +-# Delete stale bytecode +-COMMAND="find . -name \"*.pyc\" -delete" +-echo "Cleaning up stale Python bytecode ($COMMAND)..." +-eval $COMMAND +- +-# Uninstall any Python packages which are no longer needed +-COMMAND="${PIP} uninstall -r old_requirements.txt -y" +-echo "Removing old Python packages ($COMMAND)..." +-eval $COMMAND +- +-# Install any new Python packages +-COMMAND="${PIP} install -r requirements.txt --upgrade" +-echo "Updating required Python packages ($COMMAND)..." +-eval $COMMAND +- + # Apply any database migrations + COMMAND="${PYTHON} netbox/manage.py migrate" + echo "Applying database migrations ($COMMAND)..." diff --git a/www-apps/netbox/files/netbox-rqworker.initd b/www-apps/netbox/files/netbox-rqworker.initd index 2973e471e038..54794f26fb90 100644 --- a/www-apps/netbox/files/netbox-rqworker.initd +++ b/www-apps/netbox/files/netbox-rqworker.initd @@ -8,4 +8,6 @@ command=/usr/bin/python3 command_args="/opt/netbox/netbox/manage.py rqworker" command_user=netbox:netbox directory=/opt/netbox/netbox +error_log=/var/log/netbox/netbox-rcworker.log +output_log=/var/log/netbox/"${RC_SVCNAME}".log supervisor=supervise-daemon diff --git a/www-apps/netbox/files/netbox.initd b/www-apps/netbox/files/netbox.initd index d0457a8372f2..74e6c3b717fb 100644 --- a/www-apps/netbox/files/netbox.initd +++ b/www-apps/netbox/files/netbox.initd @@ -7,4 +7,6 @@ command=/usr/bin/gunicorn command_args="-c /etc/netbox/gunicorn_config.py netbox.wsgi" command_user=netbox:netbox directory=/opt/netbox/netbox +error_log=/var/log/netbox/"${RC_SVCNAME}".log +output_log=/var/log/netbox/"${RC_SVCNAME}".log supervisor=supervise-daemon |