1 |
commit: 4f00223e57eb3cedf306fc11b267d508a462a7be |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 30 13:55:09 2022 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 30 13:55:09 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f00223e |
7 |
|
8 |
net-analyzer/graphite-web: drop obsolete patch (PR #23758) |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
12 |
|
13 |
.../files/graphite-web-1.1.5-fhs-paths.patch | 63 ---------------------- |
14 |
1 file changed, 63 deletions(-) |
15 |
|
16 |
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch |
17 |
deleted file mode 100644 |
18 |
index 4cbbe7213b35..000000000000 |
19 |
--- a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch |
20 |
+++ /dev/null |
21 |
@@ -1,63 +0,0 @@ |
22 |
-Install FHS-style paths |
23 |
- |
24 |
---- a/conf/graphite.wsgi.example |
25 |
-+++ b/conf/graphite.wsgi.example |
26 |
-@@ -1,4 +1,4 @@ |
27 |
- import sys |
28 |
--sys.path.append('/opt/graphite/webapp') |
29 |
-+sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp') |
30 |
- |
31 |
- from graphite.wsgi import application |
32 |
---- a/setup.py |
33 |
-+++ b/setup.py |
34 |
-@@ -107,8 +107,8 @@ |
35 |
- ], |
36 |
- package_data={'graphite' : |
37 |
- ['templates/*', 'local_settings.py.example']}, |
38 |
-- scripts=glob('bin/*'), |
39 |
-- data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, |
40 |
-+ scripts=['bin/graphite-web-build-index'], |
41 |
-+ data_files=list(webapp_content.items()), |
42 |
- install_requires=['Django>=1.8,<2.1', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], |
43 |
- classifiers=[ |
44 |
- 'Intended Audience :: Developers', |
45 |
---- a/webapp/graphite/local_settings.py.example |
46 |
-+++ b/webapp/graphite/local_settings.py.example |
47 |
-@@ -101,6 +101,7 @@ |
48 |
- # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite |
49 |
- # to somewhere else |
50 |
- #GRAPHITE_ROOT = '/opt/graphite' |
51 |
-+GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web' |
52 |
- |
53 |
- # Most installs done outside of a separate tree such as /opt/graphite will |
54 |
- # need to change these settings. Note that the default settings for each |
55 |
-@@ -110,6 +111,11 @@ |
56 |
- #STATIC_ROOT = '/opt/graphite/static' |
57 |
- #LOG_DIR = '/opt/graphite/storage/log/webapp' |
58 |
- #INDEX_FILE = '/opt/graphite/storage/index' # Search index file |
59 |
-+CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web' |
60 |
-+STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon' |
61 |
-+STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content' |
62 |
-+LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web' |
63 |
-+INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search index file |
64 |
- |
65 |
- # To further or fully customize the paths, modify the following. Note that the |
66 |
- # default settings for each of these are relative to CONF_DIR and STORAGE_DIR |
67 |
-@@ -127,6 +133,8 @@ |
68 |
- #CERES_DIR = '/opt/graphite/storage/ceres' |
69 |
- #WHISPER_DIR = '/opt/graphite/storage/whisper' |
70 |
- #RRD_DIR = '/opt/graphite/storage/rrd' |
71 |
-+WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper' |
72 |
-+RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd' |
73 |
- # |
74 |
- # Data directories using the "Standard" metrics finder (i.e. not Ceres) |
75 |
- #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables |
76 |
-@@ -244,7 +244,7 @@ |
77 |
- # |
78 |
- #DATABASES = { |
79 |
- # 'default': { |
80 |
--# 'NAME': '/opt/graphite/storage/graphite.db', |
81 |
-+# 'NAME': '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/graphite.db', |
82 |
- # 'ENGINE': 'django.db.backends.sqlite3', |
83 |
- # 'USER': '', |
84 |
- # 'PASSWORD': '', |