Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Mar 2018 17:15:23 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r465299 - in head/www/py-graphite-web: . files
Message-ID:  <201803221715.w2MHFNFY097476@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Thu Mar 22 17:15:23 2018
New Revision: 465299
URL: https://svnweb.freebsd.org/changeset/ports/465299

Log:
  www/py-graphite-web: update to 1.1.2

Modified:
  head/www/py-graphite-web/Makefile   (contents, props changed)
  head/www/py-graphite-web/distinfo   (contents, props changed)
  head/www/py-graphite-web/files/patch-bin__build-index.sh   (contents, props changed)
  head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example   (contents, props changed)
  head/www/py-graphite-web/files/patch-setup.py   (contents, props changed)
  head/www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example   (contents, props changed)
  head/www/py-graphite-web/pkg-plist   (contents, props changed)

Modified: head/www/py-graphite-web/Makefile
==============================================================================
--- head/www/py-graphite-web/Makefile	Thu Mar 22 17:14:54 2018	(r465298)
+++ head/www/py-graphite-web/Makefile	Thu Mar 22 17:15:23 2018	(r465299)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	graphite-web
-PORTVERSION=	0.9.15
-PORTREVISION=	2
+PORTVERSION=	1.1.2
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -12,22 +11,21 @@ COMMENT=	Enterprise scalable realtime graphing platfor
 
 LICENSE=	APACHE20
 
-BROKEN=		conflicting dependencies (django18 and django111)
-
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:graphics/py-cairo@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:databases/py-carbon@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-tagging>=0.3.1:www/py-django-tagging@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django>=1.4:www/py-django@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
 		xorg-fonts-truetype>=0:x11-fonts/xorg-fonts-truetype
 
 FETCH_ARGS=	-o ${DISTNAME}${EXTRACT_SUFX}
-USES=		cpe python:2.7
+USES=		cpe python:2.7 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	graphite-project
 CPE_VENDOR=	graphite_project
 CPE_PRODUCT=	graphite
 USE_PYTHON=	distutils
+SHEBANG_FILES=	bin/build-index.sh
 SUB_FILES=	pkg-message
 SUB_LIST+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP} DATADIR=${DATADIR}

Modified: head/www/py-graphite-web/distinfo
==============================================================================
--- head/www/py-graphite-web/distinfo	Thu Mar 22 17:14:54 2018	(r465298)
+++ head/www/py-graphite-web/distinfo	Thu Mar 22 17:15:23 2018	(r465299)
@@ -1,2 +1,3 @@
-SHA256 (graphite-project-graphite-web-0.9.15_GH0.tar.gz) = 75c53e9de089738280f1ed1084b6b4df79b9f94cb99a20c479645046c80ca677
-SIZE (graphite-project-graphite-web-0.9.15_GH0.tar.gz) = 2434438
+TIMESTAMP = 1521721030
+SHA256 (graphite-project-graphite-web-1.1.2_GH0.tar.gz) = 8a36221db5a17d9cbee11e85be5c346024a6229d28e9d8c2417d1660bf9cfe8e
+SIZE (graphite-project-graphite-web-1.1.2_GH0.tar.gz) = 1431547

Modified: head/www/py-graphite-web/files/patch-bin__build-index.sh
==============================================================================
--- head/www/py-graphite-web/files/patch-bin__build-index.sh	Thu Mar 22 17:14:54 2018	(r465298)
+++ head/www/py-graphite-web/files/patch-bin__build-index.sh	Thu Mar 22 17:15:23 2018	(r465299)
@@ -1,48 +1,9 @@
---- bin/build-index.sh.orig	2014-02-14 15:05:38.180621787 +0000
-+++ bin/build-index.sh	2014-02-14 15:31:54.580513137 +0000
-@@ -1,17 +1,19 @@
--#!/bin/bash
-+#!/bin/sh
+--- bin/build-index.sh.orig	2018-02-13 06:01:34.000000000 -0500
++++ bin/build-index.sh	2018-03-22 08:58:11.785051000 -0400
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-export PYTHONPATH="/opt/graphite/webapp/:$PYTHONPATH"
++export PYTHONPATH="%%PREFIX%%/graphite/webapp/:$PYTHONPATH"
+ BINDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
  
- if [ "$GRAPHITE_ROOT" = "" ]
- then
--  GRAPHITE_ROOT="/opt/graphite"
-+  GRAPHITE_ROOT="%%PREFIX%%/graphite"
- fi
- 
- if [ "$GRAPHITE_STORAGE_DIR" = "" ]
- then
--  GRAPHITE_STORAGE_DIR="${GRAPHITE_ROOT}/storage"
-+  GRAPHITE_STORAGE_DIR="/var/db/graphite"
- fi
- 
--
--WHISPER_DIR="${GRAPHITE_STORAGE_DIR}/whisper"
-+if [ "$WHISPER_DIR" = "" ]
-+then
-+  WHISPER_DIR="/var/db/carbon/whisper/"
-+fi
- 
- if [ ! -d "$WHISPER_DIR" ]
- then
-@@ -19,13 +21,17 @@
-   exit 1
- fi
- 
--INDEX_FILE="${GRAPHITE_STORAGE_DIR}/index"
--TMP_INDEX="${GRAPHITE_STORAGE_DIR}/.index.tmp"
-+if [ "$INDEX_FILE" = "" ]
-+then
-+  INDEX_FILE="${GRAPHITE_STORAGE_DIR}/index"
-+fi
-+
-+TMP_INDEX=${INDEX_FILE%%index}.index.tmp
- 
- rm -f $TMP_INDEX
- cd $WHISPER_DIR
- touch $INDEX_FILE
- echo "[`date`]  building index..."
--find -L . -name '*.wsp' | perl -pe 's!^[^/]+/(.+)\.wsp$!$1!; s!/!.!g' > $TMP_INDEX
-+find -L . -name '*.wsp' | sed -E 's!^[^/]+/(.+)\.wsp$!\1!; s!/!.!g' > $TMP_INDEX
- echo "[`date`]  complete, switching to new index file"
- mv -f $TMP_INDEX $INDEX_FILE
+ ${BINDIR}/build-index

Modified: head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example
==============================================================================
--- head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example	Thu Mar 22 17:14:54 2018	(r465298)
+++ head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example	Thu Mar 22 17:15:23 2018	(r465299)
@@ -1,10 +1,8 @@
---- conf/graphite.wsgi.example.orig	2015-11-27 18:37:16 UTC
-+++ conf/graphite.wsgi.example
-@@ -1,6 +1,6 @@
- import os
+--- conf/graphite.wsgi.example.orig	2018-02-13 06:01:34.000000000 -0500
++++ conf/graphite.wsgi.example	2018-03-22 09:01:22.942401000 -0400
+@@ -1,4 +1,4 @@
  import sys
 -sys.path.append('/opt/graphite/webapp')
 +sys.path.append('%%PYTHON_SITELIBDIR%%/graphite')
  
- try:
-     from importlib import import_module
+ from graphite.wsgi import application

Modified: head/www/py-graphite-web/files/patch-setup.py
==============================================================================
--- head/www/py-graphite-web/files/patch-setup.py	Thu Mar 22 17:14:54 2018	(r465298)
+++ head/www/py-graphite-web/files/patch-setup.py	Thu Mar 22 17:15:23 2018	(r465299)
@@ -1,43 +1,42 @@
---- setup.py.orig	2015-11-27 18:37:16 UTC
-+++ setup.py
-@@ -23,8 +23,6 @@ else:
+--- setup.py.orig	2018-02-13 06:01:34.000000000 -0500
++++ setup.py	2018-03-22 09:16:21.606146000 -0400
+@@ -39,10 +39,6 @@
          cf.add_section('install')
-     except ConfigParser.DuplicateSectionError:
+     except DuplicateSectionError:
          pass
--    cf.set('install', 'prefix', '/opt/graphite')
--    cf.set('install', 'install-lib', '%(prefix)s/webapp')
+-    if not cf.has_option('install', 'prefix'):
+-        cf.set('install', 'prefix', '/opt/graphite')
+-    if not cf.has_option('install', 'install-lib'):
+-        cf.set('install', 'install-lib', '%(prefix)s/webapp')
  
- with open('setup.cfg', 'wb') as f:
+ with open('setup.cfg', 'w') as f:
      cf.write(f)
-@@ -41,11 +39,11 @@ else:
+@@ -59,16 +55,16 @@
  storage_dirs = []
  
- for subdir in ('whisper', 'rrd', 'log', 'log/webapp'):
+ for subdir in ('whisper', 'ceres', 'rrd', 'log', 'log/webapp'):
 -  storage_dirs.append( ('storage/%s' % subdir, []) )
 +  storage_dirs.append( ('graphite/storage/%s' % subdir, []) )
  
- webapp_content = {}
+ webapp_content = defaultdict(list)
  
 -for root, dirs, files in os.walk('webapp/content'):
 +for root, dirs, files in os.walk('graphite/webapp/content'):
    for filename in files:
      filepath = os.path.join(root, filename)
- 
-@@ -55,7 +53,7 @@ for root, dirs, files in os.walk('webapp
      webapp_content[root].append(filepath)
  
- 
 -conf_files = [ ('conf', glob('conf/*.example')) ]
-+conf_files = [ ('%%PREFIX%%/etc/graphite', glob('conf/*.example')) ]
++conf_files = [ ('/usr/local/etc/graphite', glob('conf/*.example')) ]
  examples = [ ('examples', glob('examples/example-*')) ]
  
  try:
-@@ -87,7 +85,7 @@ try:
+@@ -108,7 +104,7 @@
        package_data={'graphite' :
          ['templates/*', 'local_settings.py.example']},
        scripts=glob('bin/*'),
--      data_files=webapp_content.items() + storage_dirs + conf_files + examples,
-+      data_files=conf_files,
-       **setup_kwargs
-     )
- finally:
+-      data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
++      data_files=list(conf_files),
+       install_requires=['Django>=1.8,<1.11.99', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
+       classifiers=[
+           'Intended Audience :: Developers',

Modified: head/www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example
==============================================================================
--- head/www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example	Thu Mar 22 17:14:54 2018	(r465298)
+++ head/www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example	Thu Mar 22 17:15:23 2018	(r465299)
@@ -1,16 +1,25 @@
---- webapp/graphite/local_settings.py.example.orig	2015-11-27 18:37:16 UTC
-+++ webapp/graphite/local_settings.py.example
-@@ -62,6 +62,9 @@
+--- webapp/graphite/local_settings.py.example.orig	2018-02-13 06:01:34.000000000 -0500
++++ webapp/graphite/local_settings.py.example	2018-03-22 09:10:17.659675000 -0400
+@@ -108,15 +108,27 @@
  #CONF_DIR = '/opt/graphite/conf'
  #STORAGE_DIR = '/opt/graphite/storage'
- #CONTENT_DIR = '/opt/graphite/webapp/content'
+ #STATIC_ROOT = '/opt/graphite/static'
 +CONF_DIR = '%%PREFIX%%/etc/graphite'
 +STORAGE_DIR = '/var/db/carbon'
-+CONTENT_DIR = '%%PREFIX%%/share/graphite-web/content'
++STATIC_ROOT = '%%PREFIX%%/share/graphite-web/content'
++
+ #LOG_DIR = '/opt/graphite/storage/log/webapp'
+ #INDEX_FILE = '/opt/graphite/storage/index'     # Search index file
  
++WHISPER_DIR = '/var/db/carbon/whisper'
++RRD_DIR = '/var/db/carbon/rrd'
++DATA_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
++LOG_DIR = '/var/log/graphite'
++INDEX_FILE = '/var/db/graphite/index'  # Search index file
++
  # 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 +72,8 @@
+ #
  ## Webapp config files
  #DASHBOARD_CONF = '/opt/graphite/conf/dashboard.conf'
  #GRAPHTEMPLATES_CONF = '/opt/graphite/conf/graphTemplates.conf'
@@ -18,21 +27,8 @@
 +GRAPHTEMPLATES_CONF = '%%PREFIX%%/etc/graphite/graphTemplates.conf'
  
  ## Data directories
- # NOTE: If any directory is unreadable in DATA_DIRS it will break metric browsing
-@@ -77,7 +82,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 = '/var/db/carbon/whisper'
-+RRD_DIR = '/var/db/carbon/rrd'
-+DATA_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
-+LOG_DIR = '/var/log/graphite'
-+INDEX_FILE = '/var/db/graphite/index'  # Search index file
- 
- #####################################
- # Email Configuration #
-@@ -158,7 +167,12 @@
+ #
+@@ -253,7 +265,12 @@
  #    }
  #}
  #

Modified: head/www/py-graphite-web/pkg-plist
==============================================================================
--- head/www/py-graphite-web/pkg-plist	Thu Mar 22 17:14:54 2018	(r465298)
+++ head/www/py-graphite-web/pkg-plist	Thu Mar 22 17:15:23 2018	(r465299)
@@ -1,11 +1,9 @@
+bin/build-index
 bin/build-index.sh
 @sample etc/graphite/dashboard.conf.example etc/graphite/dashboard.conf
 @sample etc/graphite/graphTemplates.conf.example etc/graphite/graphTemplates.conf
 @sample etc/graphite/graphite.wsgi.example etc/graphite/graphite.wsgi
 @sample etc/graphite/local_settings.py.example etc/graphite/local_settings.py
-%%DATADIR%%/examples/example-client.py
-%%DATADIR%%/examples/example-graphite-vhost.conf
-%%DATADIR%%/content/css/cli.css
 %%DATADIR%%/content/css/darkX.css
 %%DATADIR%%/content/css/darkX/button-close-focused.png
 %%DATADIR%%/content/css/darkX/button-maximize-focused.png
@@ -42,17 +40,20 @@ bin/build-index.sh
 %%DATADIR%%/content/css/table.css
 %%DATADIR%%/content/html/completerHelp.html
 %%DATADIR%%/content/html/searchHelp.html
-%%DATADIR%%/content/html/timeHelp.html
 %%DATADIR%%/content/img/blank.gif
 %%DATADIR%%/content/img/calendar.png
 %%DATADIR%%/content/img/carbon-fiber.png
 %%DATADIR%%/content/img/clock.png
 %%DATADIR%%/content/img/clock_16.png
+%%DATADIR%%/content/img/favicon.ico
+%%DATADIR%%/content/img/graphite-logo.png
 %%DATADIR%%/content/img/graphite.png
 %%DATADIR%%/content/img/graphite_short.png
 %%DATADIR%%/content/img/leaf.gif
 %%DATADIR%%/content/img/mini-bottom2.gif
 %%DATADIR%%/content/img/mini-top2.gif
+%%DATADIR%%/content/img/move_down.png
+%%DATADIR%%/content/img/move_up.png
 %%DATADIR%%/content/img/overview.png
 %%DATADIR%%/content/img/refresh.png
 %%DATADIR%%/content/img/save.png
@@ -74,234 +75,59 @@ bin/build-index.sh
 %%DATADIR%%/content/js/ace/theme-textmate.js
 %%DATADIR%%/content/js/ace/worker-javascript.js
 %%DATADIR%%/content/js/browser.js
-%%DATADIR%%/content/js/cli.js
 %%DATADIR%%/content/js/completer.js
 %%DATADIR%%/content/js/composer.js
 %%DATADIR%%/content/js/composer_widgets.js
 %%DATADIR%%/content/js/dashboard.js
 %%DATADIR%%/content/js/ext/adapter/ext/ext-base-debug.js
 %%DATADIR%%/content/js/ext/adapter/ext/ext-base.js
-%%DATADIR%%/content/js/ext/adapter/jquery/ext-jquery-adapter-debug.js
-%%DATADIR%%/content/js/ext/adapter/jquery/ext-jquery-adapter.js
-%%DATADIR%%/content/js/ext/adapter/prototype/ext-prototype-adapter-debug.js
-%%DATADIR%%/content/js/ext/adapter/prototype/ext-prototype-adapter.js
-%%DATADIR%%/content/js/ext/adapter/yui/ext-yui-adapter-debug.js
-%%DATADIR%%/content/js/ext/adapter/yui/ext-yui-adapter.js
-%%DATADIR%%/content/js/ext/examples/shared/icons/arrow-down.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/arrow-up.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/SILK.txt
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/accept.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/add.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/add.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/application_go.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/application_view_list.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/book.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/cog.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/cog_edit.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/connect.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/connect.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/control_rewind.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/cross.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/delete.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/error.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/feed_add.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/feed_delete.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/feed_error.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/folder_go.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/folder_wrench.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/grid.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/image_add.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/information.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/plugin.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/plugin_add.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/rss_go.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/table_refresh.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_add.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_add.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_comment.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_delete.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_delete.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_edit.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_female.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_female.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_gray.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_green.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_green.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_orange.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_red.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_suit.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/fam/user_suit.png
-%%DATADIR%%/content/js/ext/examples/shared/icons/save.gif
-%%DATADIR%%/content/js/ext/examples/shared/icons/silk.css
 %%DATADIR%%/content/js/ext/ext-all-debug.js
 %%DATADIR%%/content/js/ext/ext-all.js
-%%DATADIR%%/content/js/ext/license.txt
-%%DATADIR%%/content/js/ext/pkgs/cmp-foundation-debug.js
-%%DATADIR%%/content/js/ext/pkgs/cmp-foundation.js
-%%DATADIR%%/content/js/ext/pkgs/data-foundation-debug.js
-%%DATADIR%%/content/js/ext/pkgs/data-foundation.js
-%%DATADIR%%/content/js/ext/pkgs/data-grouping-debug.js
-%%DATADIR%%/content/js/ext/pkgs/data-grouping.js
-%%DATADIR%%/content/js/ext/pkgs/data-json-debug.js
-%%DATADIR%%/content/js/ext/pkgs/data-json.js
-%%DATADIR%%/content/js/ext/pkgs/data-list-views-debug.js
-%%DATADIR%%/content/js/ext/pkgs/data-list-views.js
-%%DATADIR%%/content/js/ext/pkgs/data-xml-debug.js
-%%DATADIR%%/content/js/ext/pkgs/data-xml.js
-%%DATADIR%%/content/js/ext/pkgs/direct-debug.js
-%%DATADIR%%/content/js/ext/pkgs/direct.js
-%%DATADIR%%/content/js/ext/pkgs/ext-core-debug.js
-%%DATADIR%%/content/js/ext/pkgs/ext-core.js
-%%DATADIR%%/content/js/ext/pkgs/ext-dd-debug.js
-%%DATADIR%%/content/js/ext/pkgs/ext-dd.js
-%%DATADIR%%/content/js/ext/pkgs/ext-foundation-debug.js
-%%DATADIR%%/content/js/ext/pkgs/ext-foundation.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-buttons-debug.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-buttons.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-charts-debug.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-charts.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-forms-debug.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-forms.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-grid-editor-debug.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-grid-editor.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-grid-foundation-debug.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-grid-foundation.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-grid-grouping-debug.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-grid-grouping.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-grid-property-debug.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-grid-property.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-history-debug.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-history.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-menu-debug.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-menu.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-tabs-debug.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-tabs.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-tips-debug.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-tips.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-toolbars-debug.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-toolbars.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-tree-debug.js
-%%DATADIR%%/content/js/ext/pkgs/pkg-tree.js
-%%DATADIR%%/content/js/ext/pkgs/resizable-debug.js
-%%DATADIR%%/content/js/ext/pkgs/resizable.js
-%%DATADIR%%/content/js/ext/pkgs/state-debug.js
-%%DATADIR%%/content/js/ext/pkgs/state.js
-%%DATADIR%%/content/js/ext/pkgs/window-debug.js
-%%DATADIR%%/content/js/ext/pkgs/window.js
-%%DATADIR%%/content/js/ext/resources/charts.swf
-%%DATADIR%%/content/js/ext/resources/css/README.txt
-%%DATADIR%%/content/js/ext/resources/css/debug.css
-%%DATADIR%%/content/js/ext/resources/css/ext-all-notheme.css
 %%DATADIR%%/content/js/ext/resources/css/ext-all.css
-%%DATADIR%%/content/js/ext/resources/css/reset-min.css
-%%DATADIR%%/content/js/ext/resources/css/structure/borders.css
-%%DATADIR%%/content/js/ext/resources/css/structure/box.css
-%%DATADIR%%/content/js/ext/resources/css/structure/button.css
-%%DATADIR%%/content/js/ext/resources/css/structure/combo.css
-%%DATADIR%%/content/js/ext/resources/css/structure/core.css
-%%DATADIR%%/content/js/ext/resources/css/structure/date-picker.css
-%%DATADIR%%/content/js/ext/resources/css/structure/dd.css
-%%DATADIR%%/content/js/ext/resources/css/structure/debug.css
-%%DATADIR%%/content/js/ext/resources/css/structure/dialog.css
-%%DATADIR%%/content/js/ext/resources/css/structure/editor.css
-%%DATADIR%%/content/js/ext/resources/css/structure/form.css
-%%DATADIR%%/content/js/ext/resources/css/structure/grid.css
-%%DATADIR%%/content/js/ext/resources/css/structure/layout.css
-%%DATADIR%%/content/js/ext/resources/css/structure/list-view.css
-%%DATADIR%%/content/js/ext/resources/css/structure/menu.css
-%%DATADIR%%/content/js/ext/resources/css/structure/panel-reset.css
-%%DATADIR%%/content/js/ext/resources/css/structure/panel.css
-%%DATADIR%%/content/js/ext/resources/css/structure/pivotgrid.css
-%%DATADIR%%/content/js/ext/resources/css/structure/progress.css
-%%DATADIR%%/content/js/ext/resources/css/structure/qtips.css
-%%DATADIR%%/content/js/ext/resources/css/structure/reset.css
-%%DATADIR%%/content/js/ext/resources/css/structure/resizable.css
-%%DATADIR%%/content/js/ext/resources/css/structure/slider.css
-%%DATADIR%%/content/js/ext/resources/css/structure/tabs.css
-%%DATADIR%%/content/js/ext/resources/css/structure/toolbar.css
-%%DATADIR%%/content/js/ext/resources/css/structure/tree.css
-%%DATADIR%%/content/js/ext/resources/css/structure/window.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/borders.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/box.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/button.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/combo.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/core.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/date-picker.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/dd.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/debug.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/dialog.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/editor.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/form.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/grid.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/layout.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/list-view.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/menu.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/panel.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/progress.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/qtips.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/resizable.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/slider.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/tabs.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/toolbar.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/tree.css
-%%DATADIR%%/content/js/ext/resources/css/theme-access/window.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/borders.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/box.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/button.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/combo.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/core.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/date-picker.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/dd.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/debug.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/dialog.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/editor.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/form.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/grid.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/layout.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/list-view.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/menu.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/panel.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/pivotgrid.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/progress.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/qtips.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/resizable.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/slider.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/tabs.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/toolbar.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/tree.css
-%%DATADIR%%/content/js/ext/resources/css/theme-gray/window.css
-%%DATADIR%%/content/js/ext/resources/css/visual/borders.css
-%%DATADIR%%/content/js/ext/resources/css/visual/box.css
-%%DATADIR%%/content/js/ext/resources/css/visual/button.css
-%%DATADIR%%/content/js/ext/resources/css/visual/combo.css
-%%DATADIR%%/content/js/ext/resources/css/visual/core.css
-%%DATADIR%%/content/js/ext/resources/css/visual/date-picker.css
-%%DATADIR%%/content/js/ext/resources/css/visual/dd.css
-%%DATADIR%%/content/js/ext/resources/css/visual/debug.css
-%%DATADIR%%/content/js/ext/resources/css/visual/dialog.css
-%%DATADIR%%/content/js/ext/resources/css/visual/editor.css
-%%DATADIR%%/content/js/ext/resources/css/visual/form.css
-%%DATADIR%%/content/js/ext/resources/css/visual/grid.css
-%%DATADIR%%/content/js/ext/resources/css/visual/layout.css
-%%DATADIR%%/content/js/ext/resources/css/visual/list-view.css
-%%DATADIR%%/content/js/ext/resources/css/visual/menu.css
-%%DATADIR%%/content/js/ext/resources/css/visual/panel.css
-%%DATADIR%%/content/js/ext/resources/css/visual/pivotgrid.css
-%%DATADIR%%/content/js/ext/resources/css/visual/progress.css
-%%DATADIR%%/content/js/ext/resources/css/visual/qtips.css
-%%DATADIR%%/content/js/ext/resources/css/visual/resizable.css
-%%DATADIR%%/content/js/ext/resources/css/visual/slider.css
-%%DATADIR%%/content/js/ext/resources/css/visual/tabs.css
-%%DATADIR%%/content/js/ext/resources/css/visual/toolbar.css
-%%DATADIR%%/content/js/ext/resources/css/visual/tree.css
-%%DATADIR%%/content/js/ext/resources/css/visual/window.css
-%%DATADIR%%/content/js/ext/resources/css/xtheme-access.css
-%%DATADIR%%/content/js/ext/resources/css/xtheme-blue.css
-%%DATADIR%%/content/js/ext/resources/css/xtheme-gray.css
-%%DATADIR%%/content/js/ext/resources/css/yourtheme.css
-%%DATADIR%%/content/js/ext/resources/expressinstall.swf
+%%DATADIR%%/content/js/ext/resources/icons/fam/SILK.txt
+%%DATADIR%%/content/js/ext/resources/icons/fam/accept.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/add.gif
+%%DATADIR%%/content/js/ext/resources/icons/fam/add.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/application_go.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/application_view_list.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/book.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/cog.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/cog_edit.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/connect.gif
+%%DATADIR%%/content/js/ext/resources/icons/fam/connect.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/control_rewind.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/cross.gif
+%%DATADIR%%/content/js/ext/resources/icons/fam/delete.gif
+%%DATADIR%%/content/js/ext/resources/icons/fam/error.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/feed_add.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/feed_delete.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/feed_error.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/folder_go.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/folder_wrench.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/grid.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/image_add.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/information.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/plugin.gif
+%%DATADIR%%/content/js/ext/resources/icons/fam/plugin_add.gif
+%%DATADIR%%/content/js/ext/resources/icons/fam/rss_go.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/table_refresh.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/user.gif
+%%DATADIR%%/content/js/ext/resources/icons/fam/user.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_add.gif
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_add.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_comment.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_delete.gif
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_delete.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_edit.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_female.gif
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_female.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_gray.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_green.gif
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_green.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_orange.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_red.png
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_suit.gif
+%%DATADIR%%/content/js/ext/resources/icons/fam/user_suit.png
 %%DATADIR%%/content/js/ext/resources/images/default/box/corners-blue.gif
 %%DATADIR%%/content/js/ext/resources/images/default/box/corners.gif
 %%DATADIR%%/content/js/ext/resources/images/default/box/l-blue.gif
@@ -526,25 +352,26 @@ bin/build-index.sh
 %%DATADIR%%/content/js/ext/resources/images/default/window/top-bottom.png
 %%DATADIR%%/content/js/ext/resources/images/default/window/top-bottom.psd
 %%DATADIR%%/content/js/ext/ux/DataViewTransition.js
-%%DATADIR%%/content/js/scriptaculous/builder.js
-%%DATADIR%%/content/js/scriptaculous/controls.js
-%%DATADIR%%/content/js/scriptaculous/dragdrop.js
-%%DATADIR%%/content/js/scriptaculous/effects.js
-%%DATADIR%%/content/js/scriptaculous/scriptaculous.js
-%%DATADIR%%/content/js/scriptaculous/slider.js
-%%DATADIR%%/content/js/window/effects.js
-%%DATADIR%%/content/js/window/prototype.js
-%%DATADIR%%/content/js/window/window.js
-%%DATADIR%%/content/js/window/window_effects.js
+%%DATADIR%%/examples/example-client.py
+%%DATADIR%%/examples/example-graphite-vhost.conf
 %%PYTHON_SITELIBDIR%%/graphite/__init__.py
 %%PYTHON_SITELIBDIR%%/graphite/__init__.pyc
 %%PYTHON_SITELIBDIR%%/graphite/__init__.pyo
 %%PYTHON_SITELIBDIR%%/graphite/account/__init__.py
 %%PYTHON_SITELIBDIR%%/graphite/account/__init__.pyc
 %%PYTHON_SITELIBDIR%%/graphite/account/__init__.pyo
+%%PYTHON_SITELIBDIR%%/graphite/account/admin.py
+%%PYTHON_SITELIBDIR%%/graphite/account/admin.pyc
+%%PYTHON_SITELIBDIR%%/graphite/account/admin.pyo
 %%PYTHON_SITELIBDIR%%/graphite/account/ldapBackend.py
 %%PYTHON_SITELIBDIR%%/graphite/account/ldapBackend.pyc
 %%PYTHON_SITELIBDIR%%/graphite/account/ldapBackend.pyo
+%%PYTHON_SITELIBDIR%%/graphite/account/migrations/0001_initial.py
+%%PYTHON_SITELIBDIR%%/graphite/account/migrations/0001_initial.pyc
+%%PYTHON_SITELIBDIR%%/graphite/account/migrations/0001_initial.pyo
+%%PYTHON_SITELIBDIR%%/graphite/account/migrations/__init__.py
+%%PYTHON_SITELIBDIR%%/graphite/account/migrations/__init__.pyc
+%%PYTHON_SITELIBDIR%%/graphite/account/migrations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/graphite/account/models.py
 %%PYTHON_SITELIBDIR%%/graphite/account/models.pyc
 %%PYTHON_SITELIBDIR%%/graphite/account/models.pyo
@@ -566,24 +393,12 @@ bin/build-index.sh
 %%PYTHON_SITELIBDIR%%/graphite/browser/views.py
 %%PYTHON_SITELIBDIR%%/graphite/browser/views.pyc
 %%PYTHON_SITELIBDIR%%/graphite/browser/views.pyo
-%%PYTHON_SITELIBDIR%%/graphite/cli/__init__.py
-%%PYTHON_SITELIBDIR%%/graphite/cli/__init__.pyc
-%%PYTHON_SITELIBDIR%%/graphite/cli/__init__.pyo
-%%PYTHON_SITELIBDIR%%/graphite/cli/commands.py
-%%PYTHON_SITELIBDIR%%/graphite/cli/commands.pyc
-%%PYTHON_SITELIBDIR%%/graphite/cli/commands.pyo
-%%PYTHON_SITELIBDIR%%/graphite/cli/completer.py
-%%PYTHON_SITELIBDIR%%/graphite/cli/completer.pyc
-%%PYTHON_SITELIBDIR%%/graphite/cli/completer.pyo
-%%PYTHON_SITELIBDIR%%/graphite/cli/parser.py
-%%PYTHON_SITELIBDIR%%/graphite/cli/parser.pyc
-%%PYTHON_SITELIBDIR%%/graphite/cli/parser.pyo
-%%PYTHON_SITELIBDIR%%/graphite/cli/urls.py
-%%PYTHON_SITELIBDIR%%/graphite/cli/urls.pyc
-%%PYTHON_SITELIBDIR%%/graphite/cli/urls.pyo
-%%PYTHON_SITELIBDIR%%/graphite/cli/views.py
-%%PYTHON_SITELIBDIR%%/graphite/cli/views.pyc
-%%PYTHON_SITELIBDIR%%/graphite/cli/views.pyo
+%%PYTHON_SITELIBDIR%%/graphite/carbonlink.py
+%%PYTHON_SITELIBDIR%%/graphite/carbonlink.pyc
+%%PYTHON_SITELIBDIR%%/graphite/carbonlink.pyo
+%%PYTHON_SITELIBDIR%%/graphite/compat.py
+%%PYTHON_SITELIBDIR%%/graphite/compat.pyc
+%%PYTHON_SITELIBDIR%%/graphite/compat.pyo
 %%PYTHON_SITELIBDIR%%/graphite/composer/__init__.py
 %%PYTHON_SITELIBDIR%%/graphite/composer/__init__.pyc
 %%PYTHON_SITELIBDIR%%/graphite/composer/__init__.pyo
@@ -599,6 +414,12 @@ bin/build-index.sh
 %%PYTHON_SITELIBDIR%%/graphite/dashboard/admin.py
 %%PYTHON_SITELIBDIR%%/graphite/dashboard/admin.pyc
 %%PYTHON_SITELIBDIR%%/graphite/dashboard/admin.pyo
+%%PYTHON_SITELIBDIR%%/graphite/dashboard/migrations/0001_initial.py
+%%PYTHON_SITELIBDIR%%/graphite/dashboard/migrations/0001_initial.pyc
+%%PYTHON_SITELIBDIR%%/graphite/dashboard/migrations/0001_initial.pyo
+%%PYTHON_SITELIBDIR%%/graphite/dashboard/migrations/__init__.py
+%%PYTHON_SITELIBDIR%%/graphite/dashboard/migrations/__init__.pyc
+%%PYTHON_SITELIBDIR%%/graphite/dashboard/migrations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/graphite/dashboard/models.py
 %%PYTHON_SITELIBDIR%%/graphite/dashboard/models.pyc
 %%PYTHON_SITELIBDIR%%/graphite/dashboard/models.pyo
@@ -611,12 +432,24 @@ bin/build-index.sh
 %%PYTHON_SITELIBDIR%%/graphite/dashboard/views.py
 %%PYTHON_SITELIBDIR%%/graphite/dashboard/views.pyc
 %%PYTHON_SITELIBDIR%%/graphite/dashboard/views.pyo
+%%PYTHON_SITELIBDIR%%/graphite/errors.py
+%%PYTHON_SITELIBDIR%%/graphite/errors.pyc
+%%PYTHON_SITELIBDIR%%/graphite/errors.pyo
 %%PYTHON_SITELIBDIR%%/graphite/events/__init__.py
 %%PYTHON_SITELIBDIR%%/graphite/events/__init__.pyc
 %%PYTHON_SITELIBDIR%%/graphite/events/__init__.pyo
 %%PYTHON_SITELIBDIR%%/graphite/events/admin.py
 %%PYTHON_SITELIBDIR%%/graphite/events/admin.pyc
 %%PYTHON_SITELIBDIR%%/graphite/events/admin.pyo
+%%PYTHON_SITELIBDIR%%/graphite/events/compat.py
+%%PYTHON_SITELIBDIR%%/graphite/events/compat.pyc
+%%PYTHON_SITELIBDIR%%/graphite/events/compat.pyo
+%%PYTHON_SITELIBDIR%%/graphite/events/migrations/0001_initial.py
+%%PYTHON_SITELIBDIR%%/graphite/events/migrations/0001_initial.pyc
+%%PYTHON_SITELIBDIR%%/graphite/events/migrations/0001_initial.pyo
+%%PYTHON_SITELIBDIR%%/graphite/events/migrations/__init__.py
+%%PYTHON_SITELIBDIR%%/graphite/events/migrations/__init__.pyc
+%%PYTHON_SITELIBDIR%%/graphite/events/migrations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/graphite/events/models.py
 %%PYTHON_SITELIBDIR%%/graphite/events/models.pyc
 %%PYTHON_SITELIBDIR%%/graphite/events/models.pyo
@@ -626,29 +459,83 @@ bin/build-index.sh
 %%PYTHON_SITELIBDIR%%/graphite/events/views.py
 %%PYTHON_SITELIBDIR%%/graphite/events/views.pyc
 %%PYTHON_SITELIBDIR%%/graphite/events/views.pyo
-%%PYTHON_SITELIBDIR%%/graphite/local_settings.py.example
+%%PYTHON_SITELIBDIR%%/graphite/finders/__init__.py
+%%PYTHON_SITELIBDIR%%/graphite/finders/__init__.pyc
+%%PYTHON_SITELIBDIR%%/graphite/finders/__init__.pyo
+%%PYTHON_SITELIBDIR%%/graphite/finders/ceres.py
+%%PYTHON_SITELIBDIR%%/graphite/finders/ceres.pyc
+%%PYTHON_SITELIBDIR%%/graphite/finders/ceres.pyo
+%%PYTHON_SITELIBDIR%%/graphite/finders/remote.py
+%%PYTHON_SITELIBDIR%%/graphite/finders/remote.pyc
+%%PYTHON_SITELIBDIR%%/graphite/finders/remote.pyo
+%%PYTHON_SITELIBDIR%%/graphite/finders/standard.py
+%%PYTHON_SITELIBDIR%%/graphite/finders/standard.pyc
+%%PYTHON_SITELIBDIR%%/graphite/finders/standard.pyo
+%%PYTHON_SITELIBDIR%%/graphite/finders/utils.py
+%%PYTHON_SITELIBDIR%%/graphite/finders/utils.pyc
+%%PYTHON_SITELIBDIR%%/graphite/finders/utils.pyo
+%%PYTHON_SITELIBDIR%%/graphite/functions/__init__.py
+%%PYTHON_SITELIBDIR%%/graphite/functions/__init__.pyc
+%%PYTHON_SITELIBDIR%%/graphite/functions/__init__.pyo
+%%PYTHON_SITELIBDIR%%/graphite/functions/custom/__init__.py
+%%PYTHON_SITELIBDIR%%/graphite/functions/custom/__init__.pyc
+%%PYTHON_SITELIBDIR%%/graphite/functions/custom/__init__.pyo
+%%PYTHON_SITELIBDIR%%/graphite/functions/params.py
+%%PYTHON_SITELIBDIR%%/graphite/functions/params.pyc
+%%PYTHON_SITELIBDIR%%/graphite/functions/params.pyo
+%%PYTHON_SITELIBDIR%%/graphite/functions/urls.py
+%%PYTHON_SITELIBDIR%%/graphite/functions/urls.pyc
+%%PYTHON_SITELIBDIR%%/graphite/functions/urls.pyo
+%%PYTHON_SITELIBDIR%%/graphite/functions/views.py
+%%PYTHON_SITELIBDIR%%/graphite/functions/views.pyc
+%%PYTHON_SITELIBDIR%%/graphite/functions/views.pyo
+%%PYTHON_SITELIBDIR%%/graphite/http_pool.py
+%%PYTHON_SITELIBDIR%%/graphite/http_pool.pyc
+%%PYTHON_SITELIBDIR%%/graphite/http_pool.pyo
+%%PYTHON_SITELIBDIR%%/graphite/intervals.py
+%%PYTHON_SITELIBDIR%%/graphite/intervals.pyc
+%%PYTHON_SITELIBDIR%%/graphite/intervals.pyo
 %%PYTHON_SITELIBDIR%%/graphite/local_settings.py
+%%PYTHON_SITELIBDIR%%/graphite/local_settings.py.example
 %%PYTHON_SITELIBDIR%%/graphite/logger.py
 %%PYTHON_SITELIBDIR%%/graphite/logger.pyc
 %%PYTHON_SITELIBDIR%%/graphite/logger.pyo
-%%PYTHON_SITELIBDIR%%/graphite/manage.py
-%%PYTHON_SITELIBDIR%%/graphite/manage.pyc
-%%PYTHON_SITELIBDIR%%/graphite/manage.pyo
 %%PYTHON_SITELIBDIR%%/graphite/metrics/__init__.py
 %%PYTHON_SITELIBDIR%%/graphite/metrics/__init__.pyc
 %%PYTHON_SITELIBDIR%%/graphite/metrics/__init__.pyo
-%%PYTHON_SITELIBDIR%%/graphite/metrics/search.py
-%%PYTHON_SITELIBDIR%%/graphite/metrics/search.pyc
-%%PYTHON_SITELIBDIR%%/graphite/metrics/search.pyo
 %%PYTHON_SITELIBDIR%%/graphite/metrics/urls.py
 %%PYTHON_SITELIBDIR%%/graphite/metrics/urls.pyc
 %%PYTHON_SITELIBDIR%%/graphite/metrics/urls.pyo
 %%PYTHON_SITELIBDIR%%/graphite/metrics/views.py
 %%PYTHON_SITELIBDIR%%/graphite/metrics/views.pyc
 %%PYTHON_SITELIBDIR%%/graphite/metrics/views.pyo
-%%PYTHON_SITELIBDIR%%/graphite/remote_storage.py
-%%PYTHON_SITELIBDIR%%/graphite/remote_storage.pyc
-%%PYTHON_SITELIBDIR%%/graphite/remote_storage.pyo
+%%PYTHON_SITELIBDIR%%/graphite/middleware.py
+%%PYTHON_SITELIBDIR%%/graphite/middleware.pyc
+%%PYTHON_SITELIBDIR%%/graphite/middleware.pyo
+%%PYTHON_SITELIBDIR%%/graphite/node.py
+%%PYTHON_SITELIBDIR%%/graphite/node.pyc
+%%PYTHON_SITELIBDIR%%/graphite/node.pyo
+%%PYTHON_SITELIBDIR%%/graphite/readers/__init__.py
+%%PYTHON_SITELIBDIR%%/graphite/readers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/graphite/readers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/graphite/readers/ceres.py
+%%PYTHON_SITELIBDIR%%/graphite/readers/ceres.pyc
+%%PYTHON_SITELIBDIR%%/graphite/readers/ceres.pyo
+%%PYTHON_SITELIBDIR%%/graphite/readers/multi.py
+%%PYTHON_SITELIBDIR%%/graphite/readers/multi.pyc
+%%PYTHON_SITELIBDIR%%/graphite/readers/multi.pyo
+%%PYTHON_SITELIBDIR%%/graphite/readers/remote.py
+%%PYTHON_SITELIBDIR%%/graphite/readers/remote.pyc
+%%PYTHON_SITELIBDIR%%/graphite/readers/remote.pyo
+%%PYTHON_SITELIBDIR%%/graphite/readers/rrd.py
+%%PYTHON_SITELIBDIR%%/graphite/readers/rrd.pyc
+%%PYTHON_SITELIBDIR%%/graphite/readers/rrd.pyo
+%%PYTHON_SITELIBDIR%%/graphite/readers/utils.py
+%%PYTHON_SITELIBDIR%%/graphite/readers/utils.pyc
+%%PYTHON_SITELIBDIR%%/graphite/readers/utils.pyo
+%%PYTHON_SITELIBDIR%%/graphite/readers/whisper.py
+%%PYTHON_SITELIBDIR%%/graphite/readers/whisper.pyc
+%%PYTHON_SITELIBDIR%%/graphite/readers/whisper.pyo
 %%PYTHON_SITELIBDIR%%/graphite/render/__init__.py
 %%PYTHON_SITELIBDIR%%/graphite/render/__init__.pyc
 %%PYTHON_SITELIBDIR%%/graphite/render/__init__.pyo
@@ -664,9 +551,6 @@ bin/build-index.sh
 %%PYTHON_SITELIBDIR%%/graphite/render/functions.py
 %%PYTHON_SITELIBDIR%%/graphite/render/functions.pyc
 %%PYTHON_SITELIBDIR%%/graphite/render/functions.pyo
-%%PYTHON_SITELIBDIR%%/graphite/render/functions_test.py
-%%PYTHON_SITELIBDIR%%/graphite/render/functions_test.pyc
-%%PYTHON_SITELIBDIR%%/graphite/render/functions_test.pyo
 %%PYTHON_SITELIBDIR%%/graphite/render/glyph.py
 %%PYTHON_SITELIBDIR%%/graphite/render/glyph.pyc
 %%PYTHON_SITELIBDIR%%/graphite/render/glyph.pyo
@@ -685,13 +569,48 @@ bin/build-index.sh
 %%PYTHON_SITELIBDIR%%/graphite/settings.py
 %%PYTHON_SITELIBDIR%%/graphite/settings.pyc
 %%PYTHON_SITELIBDIR%%/graphite/settings.pyo
+%%PYTHON_SITELIBDIR%%/graphite/singleton.py
+%%PYTHON_SITELIBDIR%%/graphite/singleton.pyc
+%%PYTHON_SITELIBDIR%%/graphite/singleton.pyo
 %%PYTHON_SITELIBDIR%%/graphite/storage.py
 %%PYTHON_SITELIBDIR%%/graphite/storage.pyc
 %%PYTHON_SITELIBDIR%%/graphite/storage.pyo
+%%PYTHON_SITELIBDIR%%/graphite/tags/__init__.py
+%%PYTHON_SITELIBDIR%%/graphite/tags/__init__.pyc
+%%PYTHON_SITELIBDIR%%/graphite/tags/__init__.pyo
+%%PYTHON_SITELIBDIR%%/graphite/tags/base.py
+%%PYTHON_SITELIBDIR%%/graphite/tags/base.pyc
+%%PYTHON_SITELIBDIR%%/graphite/tags/base.pyo
+%%PYTHON_SITELIBDIR%%/graphite/tags/http.py
+%%PYTHON_SITELIBDIR%%/graphite/tags/http.pyc
+%%PYTHON_SITELIBDIR%%/graphite/tags/http.pyo
+%%PYTHON_SITELIBDIR%%/graphite/tags/localdatabase.py
+%%PYTHON_SITELIBDIR%%/graphite/tags/localdatabase.pyc
+%%PYTHON_SITELIBDIR%%/graphite/tags/localdatabase.pyo
+%%PYTHON_SITELIBDIR%%/graphite/tags/migrations/0001_initial.py
+%%PYTHON_SITELIBDIR%%/graphite/tags/migrations/0001_initial.pyc
+%%PYTHON_SITELIBDIR%%/graphite/tags/migrations/0001_initial.pyo
+%%PYTHON_SITELIBDIR%%/graphite/tags/migrations/__init__.py
+%%PYTHON_SITELIBDIR%%/graphite/tags/migrations/__init__.pyc
+%%PYTHON_SITELIBDIR%%/graphite/tags/migrations/__init__.pyo
+%%PYTHON_SITELIBDIR%%/graphite/tags/models.py
+%%PYTHON_SITELIBDIR%%/graphite/tags/models.pyc
+%%PYTHON_SITELIBDIR%%/graphite/tags/models.pyo
+%%PYTHON_SITELIBDIR%%/graphite/tags/redis.py
+%%PYTHON_SITELIBDIR%%/graphite/tags/redis.pyc
+%%PYTHON_SITELIBDIR%%/graphite/tags/redis.pyo
+%%PYTHON_SITELIBDIR%%/graphite/tags/urls.py
+%%PYTHON_SITELIBDIR%%/graphite/tags/urls.pyc
+%%PYTHON_SITELIBDIR%%/graphite/tags/urls.pyo
+%%PYTHON_SITELIBDIR%%/graphite/tags/utils.py
+%%PYTHON_SITELIBDIR%%/graphite/tags/utils.pyc
+%%PYTHON_SITELIBDIR%%/graphite/tags/utils.pyo
+%%PYTHON_SITELIBDIR%%/graphite/tags/views.py
+%%PYTHON_SITELIBDIR%%/graphite/tags/views.pyc
+%%PYTHON_SITELIBDIR%%/graphite/tags/views.pyo
 %%PYTHON_SITELIBDIR%%/graphite/templates/500.html
 %%PYTHON_SITELIBDIR%%/graphite/templates/browser.html
 %%PYTHON_SITELIBDIR%%/graphite/templates/browserHeader.html
-%%PYTHON_SITELIBDIR%%/graphite/templates/cli.html
 %%PYTHON_SITELIBDIR%%/graphite/templates/composer.html
 %%PYTHON_SITELIBDIR%%/graphite/templates/dashboard.html
 %%PYTHON_SITELIBDIR%%/graphite/templates/dashboardHelp.html
@@ -700,42 +619,33 @@ bin/build-index.sh
 %%PYTHON_SITELIBDIR%%/graphite/templates/events.html
 %%PYTHON_SITELIBDIR%%/graphite/templates/login.html
 %%PYTHON_SITELIBDIR%%/graphite/templates/version.html
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/__init__.py
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/__init__.pyc
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/__init__.pyo
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pyparsing.py
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pyparsing.pyc
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pyparsing.pyo
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/__init__.py
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/__init__.pyc
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/__init__.pyo
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/exceptions.py
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/reference.py
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/reference.pyc
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/reference.pyo
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/tzfile.py
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/tzfile.pyc
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/tzfile.pyo
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/tzinfo.py
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/tzinfo.pyc
-%%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz/tzinfo.pyo
-%%PYTHON_SITELIBDIR%%/graphite/urls.py
-%%PYTHON_SITELIBDIR%%/graphite/urls.pyc
-%%PYTHON_SITELIBDIR%%/graphite/urls.pyo
+%%PYTHON_SITELIBDIR%%/graphite/umsgpack.py
+%%PYTHON_SITELIBDIR%%/graphite/umsgpack.pyc
+%%PYTHON_SITELIBDIR%%/graphite/umsgpack.pyo
 %%PYTHON_SITELIBDIR%%/graphite/url_shortener/__init__.py
 %%PYTHON_SITELIBDIR%%/graphite/url_shortener/__init__.pyc
 %%PYTHON_SITELIBDIR%%/graphite/url_shortener/__init__.pyo
 %%PYTHON_SITELIBDIR%%/graphite/url_shortener/baseconv.py
 %%PYTHON_SITELIBDIR%%/graphite/url_shortener/baseconv.pyc
 %%PYTHON_SITELIBDIR%%/graphite/url_shortener/baseconv.pyo
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/migrations/0001_initial.py
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/migrations/0001_initial.pyc
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/migrations/0001_initial.pyo
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/migrations/__init__.py
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/migrations/__init__.pyc
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/migrations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/graphite/url_shortener/models.py
 %%PYTHON_SITELIBDIR%%/graphite/url_shortener/models.pyc
 %%PYTHON_SITELIBDIR%%/graphite/url_shortener/models.pyo
 %%PYTHON_SITELIBDIR%%/graphite/url_shortener/views.py
 %%PYTHON_SITELIBDIR%%/graphite/url_shortener/views.pyc
 %%PYTHON_SITELIBDIR%%/graphite/url_shortener/views.pyo
+%%PYTHON_SITELIBDIR%%/graphite/urls.py
+%%PYTHON_SITELIBDIR%%/graphite/urls.pyc
+%%PYTHON_SITELIBDIR%%/graphite/urls.pyo
+%%PYTHON_SITELIBDIR%%/graphite/user_util.py
+%%PYTHON_SITELIBDIR%%/graphite/user_util.pyc
+%%PYTHON_SITELIBDIR%%/graphite/user_util.pyo
 %%PYTHON_SITELIBDIR%%/graphite/util.py
 %%PYTHON_SITELIBDIR%%/graphite/util.pyc
 %%PYTHON_SITELIBDIR%%/graphite/util.pyo
@@ -760,6 +670,15 @@ bin/build-index.sh
 %%PYTHON_SITELIBDIR%%/graphite/whitelist/views.py
 %%PYTHON_SITELIBDIR%%/graphite/whitelist/views.pyc
 %%PYTHON_SITELIBDIR%%/graphite/whitelist/views.pyo
+%%PYTHON_SITELIBDIR%%/graphite/worker_pool/__init__.py
+%%PYTHON_SITELIBDIR%%/graphite/worker_pool/__init__.pyc
+%%PYTHON_SITELIBDIR%%/graphite/worker_pool/__init__.pyo
+%%PYTHON_SITELIBDIR%%/graphite/worker_pool/pool.py
+%%PYTHON_SITELIBDIR%%/graphite/worker_pool/pool.pyc
+%%PYTHON_SITELIBDIR%%/graphite/worker_pool/pool.pyo
+%%PYTHON_SITELIBDIR%%/graphite/wsgi.py
+%%PYTHON_SITELIBDIR%%/graphite/wsgi.pyc
+%%PYTHON_SITELIBDIR%%/graphite/wsgi.pyo
 @rmtry %%PYTHON_SITELIBDIR%%/graphite/local_settings.pyc
 @dir(%%WWWOWN%%,%%WWWGRP%%,) /var/db/graphite
 @dir /var/log/graphite/webapp



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803221715.w2MHFNFY097476>