summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <william.hubbs@sony.com>2019-04-30 16:16:57 -0500
committerWilliam Hubbs <williamh@gentoo.org>2019-04-30 16:19:08 -0500
commit389ef2c983b62fdce58731e9cfc7c1a10e835d0d (patch)
treeb8ce5ce50238b3a067042a2554b8fead43e93207 /www-apps/netbox/files
parentdev-lang/spidermonkey: Fix BE, force /bin/bash for shell (diff)
downloadgentoo-389ef2c983b62fdce58731e9cfc7c1a10e835d0d.tar.gz
gentoo-389ef2c983b62fdce58731e9cfc7c1a10e835d0d.tar.bz2
gentoo-389ef2c983b62fdce58731e9cfc7c1a10e835d0d.zip
www-apps/netbox: 2.5.11 bump
Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: William Hubbs <williamh@gentoo.org>
Diffstat (limited to 'www-apps/netbox/files')
-rw-r--r--www-apps/netbox/files/netbox-2.5.11-no-pip.patch27
-rw-r--r--www-apps/netbox/files/netbox-rqworker.initd2
-rw-r--r--www-apps/netbox/files/netbox.initd2
3 files changed, 31 insertions, 0 deletions
diff --git a/www-apps/netbox/files/netbox-2.5.11-no-pip.patch b/www-apps/netbox/files/netbox-2.5.11-no-pip.patch
new file mode 100644
index 000000000000..5d1fa595f4e6
--- /dev/null
+++ b/www-apps/netbox/files/netbox-2.5.11-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