Move static assets to the project directory

Installing the static assets in the project directory instead of an external directory
make installation easier.

Add whitenoise to requires in setup.py so that the static assets are automatically (without
user action) served after installation.

Remove package_data from setup.py, you should use package_data or MANIFEST.in to specify
which non-python files have to be installed, not both.

MANIFEST.in

@@ -7,6 +7,6 @@ include conf/*.example
 include webapp/graphite/local_settings.py.example
 recursive-include distro/ *
 recursive-include webapp/graphite/ *.html
-recursive-include webapp/content/ *
+recursive-include webapp/graphite/static/ *
 exclude webapp/graphite/local_settings.py
 exclude conf/*.conf

setup.py

@@ -10,14 +10,7 @@
 
 for subdir in ('whisper/dummy.txt', 'ceres/dummy.txt', 'rrd/dummy.txt',
                'log/dummy.txt', 'log/webapp/dummy.txt'):
-    storage_dirs.append( ('storage/%s' % subdir, []) )
-
-webapp_content = defaultdict(list)
-
-for root, dirs, files in os.walk('webapp/content'):
-    for filename in files:
-        filepath = os.path.join(root, filename)
-        webapp_content[root].append(filepath)
+    storage_dirs.append(('storage/%s' % subdir, []))
 
 conf_files = [('conf', glob('conf/*.example'))]
 examples = [('examples', glob('examples/example-*'))]
@@ -63,11 +56,12 @@ def read(fname):
         'graphite.whitelist',
         'graphite.worker_pool',
     ],
-    package_data={'graphite': ['templates/*', 'local_settings.py.example']},
     scripts=glob('bin/*'),
-    data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
+    include_package_data=True,
+    data_files=storage_dirs + conf_files + examples,
     install_requires=['Django>=1.8,<2.2', 'django-tagging==0.4.3', 'pytz',
-                      'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
+                      'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six',
+                      'whitenoise'],
     classifiers=[
         'Intended Audience :: Developers',
         'Natural Language :: English',

webapp/graphite/settings.py

@@ -36,7 +36,6 @@
 
 # Filesystem layout
 WEB_DIR = dirname(abspath(__file__))
-WEBAPP_DIR = dirname(WEB_DIR)
 GRAPHITE_ROOT = '/opt/graphite'
 # Initialize additional path variables
 # Defaults for these are set after local_settings is imported
@@ -219,7 +218,7 @@
 
 
 STATICFILES_DIRS = (
-    join(WEBAPP_DIR, 'content'),
+    join(WEB_DIR, 'static'),
 )
 
 # Handle renamed timeout settings
@@ -229,7 +228,7 @@
 ## Set config dependent on flags set in local_settings
 # Path configuration
 if not STATIC_ROOT:
-  STATIC_ROOT = join(GRAPHITE_ROOT, 'static')
+  STATIC_ROOT = join(WEB_DIR, 'static')
 
 if not CONF_DIR:
   CONF_DIR = os.environ.get('GRAPHITE_CONF_DIR', join(GRAPHITE_ROOT, 'conf'))