grobian 15/03/10 20:17:50
Added: graphite-web-0.9.13-fhs-paths.patch
graphite-web-0.9.13-system-libs.patch
Log:
Initial ebuild by me, closes bug #435558
(Portage version: 2.2.14-prefix/cvs/SunOS i386, signed Manifest commit with
key 0x5F75F607C5C74E89)
Revision Changes Path
1.1
net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch?rev=1.1&content-type=text/plain
Index: graphite-web-0.9.13-fhs-paths.patch
===================================================================
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
1.1
net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch?rev=1.1&content-type=text/plain
Index: graphite-web-0.9.13-system-libs.patch
===================================================================
>From 1ca73dd4ec442d6ada765e5375efee84bbc7522b Mon Sep 17 00:00:00 2001
From: Jamie Nguyen <[email protected]>
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
