FHS.patch

   1 diff -up ./conf/carbon.conf.example.orig ./conf/carbon.conf.example
   2 --- ./conf/carbon.conf.example.orig     2012-05-31 15:09:32.796575476 -0600
   3 +++ ./conf/carbon.conf.example  2012-05-31 15:10:59.641332773 -0600
   4 @@ -30,10 +30,17 @@
   5  #
   6  #LOCAL_DATA_DIR = /opt/graphite/storage/whisper/
   7
   8 +STORAGE_DIR    = /var/lib/carbon/
   9 +LOCAL_DATA_DIR = /var/lib/carbon/whisper/
  10 +WHITELISTS_DIR = /var/lib/carbon/lists/
  11 +CONF_DIR       = /etc/carbon/
  12 +LOG_DIR        = /var/log/carbon/
  13 +PID_DIR        = /var/run/
  14 +
  15  # Specify the user to drop privileges to
  16  # If this is blank carbon runs as the user that invokes it
  17  # This user must have write access to the local data directory
  18 -USER =
  19 +USER = carbon
  20
  21  # Limit the size of the cache to avoid swapping or becoming CPU bound.
  22  # Sorts and serving cache queries gets more expensive as the cache grows.
  23 diff -up ./setup.cfg.orig ./setup.cfg
  24 --- ./setup.cfg.orig    2012-05-31 15:20:40.649786911 -0600
  25 +++ ./setup.cfg 2012-05-31 15:21:10.019706501 -0600
  26 @@ -1,9 +1,9 @@
  27 -[install]
  28 -prefix = /opt/graphite
  29 -install-lib = %(prefix)s/lib
  30 +#[install]
  31 +#prefix = /opt/graphite
  32 +#install-lib = %(prefix)s/lib
  33
  34 -[bdist_rpm]
  35 -requires = python-twisted
  36 -           whisper
  37 +#[bdist_rpm]
  38 +#requires = python-twisted
  39 +#           whisper
  40
  41 -post-install = distro/redhat/misc/postinstall
  42 +#post-install = distro/redhat/misc/postinstall
  43 diff -up ./setup.py.orig ./setup.py
  44 --- ./setup.py.orig     2012-05-31 15:11:28.825257256 -0600
  45 +++ ./setup.py  2012-05-31 15:29:55.807188675 -0600
  46 @@ -12,14 +12,20 @@ else:
  47    setup_kwargs = dict()
  48
  49
  50 -storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]),
  51 -                 ('storage/log',[]), ('storage/rrd',[]) ]
  52 -conf_files = [ ('conf', glob('conf/*.example')) ]
  53 +#storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]),
  54 +#                 ('storage/log',[]), ('storage/rrd',[]) ]
  55 +#conf_files = [ ('conf', glob('conf/*.example')) ]
  56  #XXX Need a way to have these work for bdist_rpm but be left alone for everything else
  57  #init_scripts = [ ('/etc/init.d', ['distro/redhat/init.d/carbon-cache',
  58  #                                  'distro/redhat/init.d/carbon-relay',
  59  #                                  'distro/redhat/init.d/carbon-aggregator']) ]
  60
  61 +storage_dirs = [
  62 +    ('/var/lib/carbon/whisper',[]),
  63 +    ('/var/lib/carbon/lists',[]),
  64 +    ('/var/lib/carbon/rrd',[])
  65 +]
  66 +
  67  setup(
  68    name='carbon',
  69    version='0.9.10',
  70 @@ -32,7 +38,8 @@ setup(
  71    package_dir={'' : 'lib'},
  72    scripts=glob('bin/*'),
  73    package_data={ 'carbon' : ['*.xml'] },
  74 -  data_files=storage_dirs + conf_files, # + init_scripts,
  75 +  #data_files=storage_dirs + conf_files, # + init_scripts,
  76 +  data_files=storage_dirs,
  77    install_requires=['twisted', 'txamqp'],
  78    **setup_kwargs
  79  )