-# Copyright 2011 GRNET S.A. All rights reserved.
+# Copyright 2011-2012 GRNET S.A. All rights reserved.
#
# Redistribution and use in source and binary forms, with or
# without modification, are permitted provided that the following
# or implied, of GRNET S.A.
from glob import glob
-from os.path import abspath, dirname, join
+from os import umask
+from os.path import abspath, dirname, exists, join
PROJECT_PATH = dirname(abspath(__file__))
for conf in sorted(conffiles):
execfile(conf)
+
+conf = join(PROJECT_PATH, 'settings.local')
+
+if exists(conf):
+ execfile(conf)
+elif exists('/etc/pithos/settings.local'):
+ execfile('/etc/pithos/settings.local')