moep/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

also allow to overwrite remote_base_dir

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-07 09:53:24 +02:00
commit 9540d529d6
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/cdist/path.py
View file

@ -25,12 +25,6 @@ import shutil
import sys import sys
import tempfile import tempfile
# Hardcoded paths usually not changable
REMOTE_BASE_DIR = "/var/lib/cdist"
REMOTE_CONF_DIR = os.path.join(REMOTE_BASE_DIR, "conf")
REMOTE_OBJECT_DIR = os.path.join(REMOTE_BASE_DIR, "object")
REMOTE_TYPE_DIR = os.path.join(REMOTE_CONF_DIR, "type")
REMOTE_GLOBAL_EXPLORER_DIR = os.path.join(REMOTE_CONF_DIR, "explorer")
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -74,6 +68,17 @@ class Path:
self.object_base_dir = os.path.join(self.out_dir, "object") self.object_base_dir = os.path.join(self.out_dir, "object")
self.bin_dir = os.path.join(self.out_dir, "bin") self.bin_dir = os.path.join(self.out_dir, "bin")
# Remote directories
if "__cdist_remote_base_dir" in os.environ:
self.remote_base_dir = os.environ['__cdist_remote_base_dir']
else:
self.remote_base_dir = "/var/lib/cdist"
self.remote_conf_dir = os.path.join(self.remote_base_dir, "conf")
self.remote_object_dir = os.path.join(self.remote_base_dir, "object")
self.remote_type_dir = os.path.join(self.remote_conf_dir, "type")
self.remote_global_explorer_dir = os.path.join(self.remote_conf_dir, "explorer")
# Create directories # Create directories
self.__init_out_dirs() self.__init_out_dirs()