diff options
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/action_reposync.py | 2 | ||||
| -rwxr-xr-x | cobbler/cobbler.py | 1 | ||||
| -rw-r--r-- | cobbler/item_repo.py | 14 |
3 files changed, 1 insertions, 16 deletions
diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py index cbd69d0..97b6ee5 100644 --- a/cobbler/action_reposync.py +++ b/cobbler/action_reposync.py @@ -53,7 +53,7 @@ class RepoSync: self.dryrun = dryrun for repo in self.repos: print "considering: %s" % repo - repo_path = os.path.join(repo.root, repo.name) + repo_path = os.path.join(self.settings.webdir, "repo_mirror", repo.name) mirror = repo.mirror if not os.path.isdir(repo_path): try: diff --git a/cobbler/cobbler.py b/cobbler/cobbler.py index 4bcd074..f11d8fb 100755 --- a/cobbler/cobbler.py +++ b/cobbler/cobbler.py @@ -266,7 +266,6 @@ class BootCLI: '--name' : lambda(a): repo.set_name(a), '--mirror' : lambda(a): repo.set_mirror(a), '--keep-updated' : lambda(a): repo.set_keep_updated(a), - '--root' : lambda(a): repo.set_root(a), '--local-filename' : lambda(a): repo.set_local_filename(a) } on_ok = lambda: self.api.repos().add(repo) diff --git a/cobbler/item_repo.py b/cobbler/item_repo.py index 7c13e8d..6e61d01 100644 --- a/cobbler/item_repo.py +++ b/cobbler/item_repo.py @@ -29,14 +29,12 @@ class Repo(item.Item): self.name = None # is required self.mirror = None # is required self.keep_updated = 1 # has reasonable defaults - self.root = "/var/www/cobbler/repo_mirror" # has reasonable defaults self.local_filename = "" # off by default def from_datastruct(self,seed_data): self.name = self.load_item(seed_data,'name') self.mirror = self.load_item(seed_data,'mirror') self.keep_updated = self.load_item(seed_data, 'keep_updated') - self.root = self.load_item(seed_data, 'root') self.local_filename = self.load_item(seed_data, 'local_filename') return self @@ -69,16 +67,6 @@ class Repo(item.Item): self.keep_updated = True return True - def set_root(self,root): - """ - Sets the directory to mirror in. Directory will include the name of the repo off of the - given root. By default, uses /var/www/cobbler/repomirror/. - """ - if os.path.isdir(root): - self.root = root - return True - raise cexceptions.CobblerException("no_exist2",root) - def set_local_filename(self,fname): """ If this repo is to be automatically configured to be "in use" for profiles that reference it, @@ -110,7 +98,6 @@ class Repo(item.Item): 'name' : self.name, 'mirror' : self.mirror, 'keep_updated' : self.keep_updated, - 'root' : self.root, 'local_filename' : self.local_filename } @@ -118,7 +105,6 @@ class Repo(item.Item): buf = "repo %-4s : %s\n" % (id, self.name) buf = buf + "mirror : %s\n" % self.mirror buf = buf + "keep updated : %s\n" % self.keep_updated - buf = buf + "root : %s\n" % self.root buf = buf + "local filename : %s\n" % self.local_filename return buf |