diff options
| -rw-r--r-- | cobbler/action_reposync.py | 7 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py index ac2cff8..e932309 100644 --- a/cobbler/action_reposync.py +++ b/cobbler/action_reposync.py @@ -224,9 +224,12 @@ class RepoSync: config_file.write("[%s]\n" % repo.name) config_file.write("name=%s\n" % repo.name) if output: - config_file.write("baseurl=http://%s/cobbler/repo_mirror/%s\n" % (self.settings.server, repo.name)) + line = "baseurl=http://%s/cobbler/repo_mirror/%s\n" % (self.settings.server, repo.name) + config_file.write(line) else: - config_file.write("baseurl=%s\n" % repo.mirror) + line = "baseurl=%s\n" % repo.mirror + line = line.replace("@@server@@",self.settings.server) + config_file.write(line) config_file.write("enabled=1\n") config_file.write("gpgcheck=0\n") config_file.close() diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index 449cdff..4efbb6a 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -33,8 +33,8 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '2.0rc8' __CHEETAH_versionTuple__ = (2, 0, 0, 'candidate', 8) -__CHEETAH_genTime__ = 1190910357.384402 -__CHEETAH_genTimestamp__ = 'Thu Sep 27 12:25:57 2007' +__CHEETAH_genTime__ = 1191014111.8635781 +__CHEETAH_genTimestamp__ = 'Fri Sep 28 17:15:11 2007' __CHEETAH_src__ = 'webui_templates/master.tmpl' __CHEETAH_srcLastModified__ = 'Thu Sep 27 12:20:28 2007' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' |