diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-analyzer/graphite-web/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-analyzer/graphite-web/files')
-rw-r--r-- | net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch | 76 | ||||
-rw-r--r-- | net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch | 100 |
2 files changed, 176 insertions, 0 deletions
diff --git a/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch new file mode 100644 index 000000000000..ecfce96e0536 --- /dev/null +++ b/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch @@ -0,0 +1,76 @@ +Install FHS-style paths + +--- graphite-web-0.9.13/conf/graphite.wsgi.example ++++ graphite-web-0.9.13/conf/graphite.wsgi.example +@@ -1,5 +1,5 @@ + import os, sys +-sys.path.append('/opt/graphite/webapp') ++sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'graphite.settings') + + import django +--- graphite-web-0.9.13/setup.py ++++ graphite-web-0.9.13/setup.py +@@ -59,7 +59,6 @@ + ], + package_data={'graphite' : + ['templates/*', 'local_settings.py.example']}, +- scripts=glob('bin/*'), +- data_files=webapp_content.items() + storage_dirs + conf_files + examples, ++ data_files=webapp_content.items(), + **setup_kwargs + ) +--- graphite-web-0.9.13/webapp/graphite/local_settings.py.example ++++ graphite-web-0.9.13/webapp/graphite/local_settings.py.example +@@ -54,14 +54,14 @@ + ##################################### + # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite + # to somewhere else +-#GRAPHITE_ROOT = '/opt/graphite' ++GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web' + + # Most installs done outside of a separate tree such as /opt/graphite will only + # need to change these three settings. Note that the default settings for each + # of these is relative to GRAPHITE_ROOT +-#CONF_DIR = '/opt/graphite/conf' +-#STORAGE_DIR = '/opt/graphite/storage' +-#CONTENT_DIR = '/opt/graphite/webapp/content' ++CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web' ++STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon' ++CONTENT_DIR = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content' + + # To further or fully customize the paths, modify the following. Note that the + # default settings for each of these are relative to CONF_DIR and STORAGE_DIR +@@ -69,6 +69,8 @@ + ## Webapp config files + #DASHBOARD_CONF = '/opt/graphite/conf/dashboard.conf' + #GRAPHTEMPLATES_CONF = '/opt/graphite/conf/graphTemplates.conf' ++DASHBOARD_CONF = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web/dashboard.conf' ++GRAPHTEMPLATES_CONF = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web/graphTemplates.conf' + + ## Data directories + # NOTE: If any directory is unreadable in DATA_DIRS it will break metric browsing +@@ -77,7 +79,11 @@ + #DATA_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables + #LOG_DIR = '/opt/graphite/storage/log/webapp' + #INDEX_FILE = '/opt/graphite/storage/index' # Search index file +- ++WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper' ++RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd' ++DATA_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables ++LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web/' ++INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search index file + + ##################################### + # Email Configuration # +--- graphite-web-0.9.13/webapp/graphite/manage.py ++++ graphite-web-0.9.13/webapp/graphite/manage.py +@@ -6,7 +6,7 @@ + + + if __name__ == "__main__": +- os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") ++ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "graphite.settings") + + from django.core.management import execute_from_command_line + diff --git a/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch b/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch new file mode 100644 index 000000000000..be5bbb9ab761 --- /dev/null +++ b/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch @@ -0,0 +1,100 @@ +From 1ca73dd4ec442d6ada765e5375efee84bbc7522b Mon Sep 17 00:00:00 2001 +From: Jamie Nguyen <j@jamielinux.com> +Date: Mon, 29 Sep 2014 09:53:22 +0100 +Subject: [PATCH] Force use of system libraries + +--- + setup.py | 2 -- + webapp/graphite/cli/parser.py | 2 +- + webapp/graphite/render/attime.py | 5 +---- + webapp/graphite/render/glyph.py | 5 +---- + webapp/graphite/render/grammar.py | 2 +- + webapp/graphite/render/views.py | 5 +---- + 6 files changed, 5 insertions(+), 16 deletions(-) + +diff --git a/setup.py b/setup.py +index 4dc0ce0..1b910d1 100644 +--- a/setup.py ++++ b/setup.py +@@ -54,8 +54,6 @@ setup( + 'graphite.graphlot', + 'graphite.events', + 'graphite.version', +- 'graphite.thirdparty', +- 'graphite.thirdparty.pytz', + ], + package_data={'graphite' : + ['templates/*', 'local_settings.py.example']}, +diff --git a/webapp/graphite/cli/parser.py b/webapp/graphite/cli/parser.py +index ec1a435..7d7d48d 100644 +--- a/webapp/graphite/cli/parser.py ++++ b/webapp/graphite/cli/parser.py +@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.""" + +-from graphite.thirdparty.pyparsing import * ++from pyparsing import * + + grammar = Forward() + +diff --git a/webapp/graphite/render/attime.py b/webapp/graphite/render/attime.py +index 55a644c..8adde3f 100644 +--- a/webapp/graphite/render/attime.py ++++ b/webapp/graphite/render/attime.py +@@ -16,10 +16,7 @@ from datetime import datetime,timedelta + from time import daylight + from django.conf import settings + +-try: # See if there is a system installation of pytz first +- import pytz +-except ImportError: # Otherwise we fall back to Graphite's bundled version +- from graphite.thirdparty import pytz ++import pytz + + + months = ['jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec'] +diff --git a/webapp/graphite/render/glyph.py b/webapp/graphite/render/glyph.py +index a2cc893..c6f31f1 100644 +--- a/webapp/graphite/render/glyph.py ++++ b/webapp/graphite/render/glyph.py +@@ -22,10 +22,7 @@ from graphite.render.datalib import TimeSeries + from graphite.util import json + + +-try: # See if there is a system installation of pytz first +- import pytz +-except ImportError: # Otherwise we fall back to Graphite's bundled version +- from graphite.thirdparty import pytz ++import pytz + + INFINITY = float('inf') + +diff --git a/webapp/graphite/render/grammar.py b/webapp/graphite/render/grammar.py +index 07e3e4b..2b0ba41 100644 +--- a/webapp/graphite/render/grammar.py ++++ b/webapp/graphite/render/grammar.py +@@ -1,4 +1,4 @@ +-from graphite.thirdparty.pyparsing import * ++from pyparsing import * + + ParserElement.enablePackrat() + grammar = Forward() +diff --git a/webapp/graphite/render/views.py b/webapp/graphite/render/views.py +index 186232e..cd747a7 100644 +--- a/webapp/graphite/render/views.py ++++ b/webapp/graphite/render/views.py +@@ -25,10 +25,7 @@ try: + except ImportError: + import pickle + +-try: # See if there is a system installation of pytz first +- import pytz +-except ImportError: # Otherwise we fall back to Graphite's bundled version +- from graphite.thirdparty import pytz ++import pytz + + from graphite.util import getProfileByUsername, json, unpickle + from graphite.remote_storage import HTTPConnectionWithTimeout +-- +1.9.3 |