Revision b2d77f0e

b/snf-pithos-app/conf/20-snf-pithos-app-settings.conf
13 13

  
14 14
# Block storage.
15 15
#PITHOS_BACKEND_BLOCK_MODULE = 'pithos.backends.lib.hashfiler'
16
PITHOS_BACKEND_BLOCK_PATH = '/user/share/synnefo/pithos/data'
16
PITHOS_BACKEND_BLOCK_PATH = '/usr/share/synnefo/pithos/data'
17 17

  
18 18
# Queue for billing.
19 19
#
b/snf-pithos-app/pithos/api/synnefo_settings.py
1
# Setup logging (use this name for the setting to avoid conflicts with django > 1.2.x).
2
LOGGING_SETUP = {
3
    'version': 1,
4
    'disable_existing_loggers': True,
5
    'formatters': {
6
        'simple': {
7
            'format': '%(message)s'
8
        },
9
        'verbose': {
10
            'format': '%(asctime)s [%(levelname)s] %(name)s %(message)s'
11
        },
12
    },
13
    'handlers': {
14
        'null': {
15
            'class': 'logging.NullHandler',
16
        },
17
        'console': {
18
            'class': 'logging.StreamHandler',
19
            'formatter': 'verbose'
20
        },
21
        'file': {
22
            'class': 'logging.FileHandler',
23
            'formatter': 'verbose'
24
        },
1
"""
2
Hooks for snf-webproject used in snf-pithos-app setup.py entry_points
3
"""
4

  
5
synnefo_installed_apps = ['pithos.api']
6

  
7
# apply required middleware
8
synnefo_middlewares = [
9
    'synnefo.lib.middleware.LoggingConfigMiddleware',
10
    'synnefo.lib.middleware.SecureMiddleware'
11
]
12

  
13
loggers = {
14
    'pithos': {
15
        'handlers': ['console'],
16
        'level': 'INFO'
25 17
    },
26
    'loggers': {
27
        'pithos': {
28
            'handlers': ['console'],
29
            'level': 'INFO'
30
        },
31
    }
32 18
}
33

  
/dev/null
1
"""
2
Hooks for snf-webproject used in snf-pithos-app setup.py entry_points
3
"""
4

  
5
from django.conf.urls.defaults import include, patterns
6

  
7
synnefo_installed_apps = ['pithos.api']
8
synnefo_urls = patterns('',
9
    (r'', include('pithos.urls')),
10
)
11
synnefo_middlewares = [
12
    'pithos.middleware.LoggingConfigMiddleware',
13
    'pithos.middleware.SecureMiddleware'
14
]
15

  
16
from pithos.api.synnefo_settings import *
/dev/null
1
# Copyright 2011-2012 GRNET S.A. All rights reserved.
2
# 
3
# Redistribution and use in source and binary forms, with or
4
# without modification, are permitted provided that the following
5
# conditions are met:
6
#
7
#   1. Redistributions of source code must retain the above
8
#      copyright notice, this list of conditions and the following
9
#      disclaimer.
10
#
11
#   2. Redistributions in binary form must reproduce the above
12
#      copyright notice, this list of conditions and the following
13
#      disclaimer in the documentation and/or other materials
14
#      provided with the distribution.
15
#
16
# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
17
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
19
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
20
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
21
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
22
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
23
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
24
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
26
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27
# POSSIBILITY OF SUCH DAMAGE.
28
#
29
# The views and conclusions contained in the software and
30
# documentation are those of the authors and should not be
31
# interpreted as representing official policies, either expressed
32
# or implied, of GRNET S.A.
33

  
34
from django.conf.urls.defaults import include, patterns
35

  
36

  
37
urlpatterns = patterns('',
38
    (r'', include('pithos.api.urls')),
39
)
b/snf-pithos-app/setup.py
65 65

  
66 66
# Package requirements
67 67
INSTALL_REQUIRES = [
68
    'snf-common',
68
    'snf-common>=0.8.1',
69 69
    'snf-pithos-backend',
70 70
    'Django>=1.2, <1.3',
71 71
    'south>=0.7, <=0.7.3'
......
200 200
     'console_scripts': [
201 201
         ],
202 202
     'synnefo': [
203
         'default_settings = pithos.synnefo_settings',
204
         'web_apps = pithos.synnefo_settings:synnefo_installed_apps',
205
         'web_middleware = pithos.synnefo_settings:synnefo_middlewares',
206
         'urls = pithos.synnefo_settings:synnefo_urls'
203
         'default_settings = pithos.api.synnefo_settings',
204
         'web_apps = pithos.api.synnefo_settings:synnefo_installed_apps',
205
         'web_middleware = pithos.api.synnefo_settings:synnefo_middlewares',
206
         'urls = pithos.api.urls:urlpatterns',
207
         'loggers = pithos.api.synnefo_settings:logging'
207 208
         ]
208 209
      },
209 210
)
b/snf-pithos-backend/setup.py
65 65

  
66 66
# Package requirements
67 67
INSTALL_REQUIRES = [
68
    'snf-common',
68
    'snf-common>=0.8.1',
69 69
    'SQLAlchemy>=0.6.3',
70 70
]
71 71

  
b/snf-pithos-tools/setup.py
67 67

  
68 68
# Package requirements
69 69
INSTALL_REQUIRES = [
70
    'snf-common'
70
    'snf-common>=0.8.1'
71 71
]
72 72

  
73 73
EXTRAS_REQUIRES = {

Also available in: Unified diff