← Back to branch summary

~andreserl/ubuntu/natty/cobbler/lp731616

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum, Chuck Short, Dave Walker (Daviey), Clint Byrum
  • Date: 2011-01-25 16:46:04 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110125164604-ceox6spg2bq5t21n
Tags: 2.1.0~bzr1988-0ubuntu1
https://launchpad.net/bugs/705441
https://launchpad.net/bugs/706995
https://launchpad.net/bugs/707113
[Chuck Short]
* New upstram release.
* Re-added get-orig-source to make it easier to make a tarball.
* Dropped 02_install-layout.patch
* Added Debian/README.Source
* Reworked webroot patch
* debian/cobbler-common.install: Don't put the init script
  in /etc/cobbler. (LP: #705441)
* debian/patches/05_fix_init_paths.patch: Don't hard code init paths
  (LP: #706995)

[Dave Walker (Daviey)]
* debian/control: For binary package koan, do not depend on cobbler as it should 
  be functional separately. However, the additional dependency of libvirt-bin 
  has been added.  (LP: #707113)

[ Clint Byrum ]
* debian/patches/series: remove 02_install-layout.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
128
128
    libpath     = "/var/lib/cobbler/"
129
129
    logpath     = "/var/log/"
130
130
 
131
 
    if os.path.exists("/etc/Suse-release"):
 
131
    if os.path.exists("/etc/SuSE-release"):
132
132
        webroot = "/srv/www/"
133
133
    elif os.path.exists("/etc/debian_version"):
134
134
        webroot = "/usr/share/cobbler/webroot/"
135
135
    else:
136
 
        webroot     = "/var/www/"
 
136
        webroot = "/var/www/"
137
137
 
138
138
    if os.path.exists("/etc/SuSE-release"):
139
139
        webconfig  = "/etc/apache2/conf.d"
179
179
            ("/usr/sbin", ["scripts/tftpd.py"]),
180
180
 
181
181
            ("%s" % webconfig,              ["config/cobbler.conf"]),
 
182
            ("%s" % webconfig,              ["config/cobbler_web.conf"]),
 
183
            ("%s" % initpath,               ["config/cobblerd"]),
182
184
            ("%s" % docpath,                ["docs/*.gz"]),
183
185
            ("installer_templates",         ["installer_templates/*"]),
184
186
            ("%skickstarts" % libpath,      ["kickstarts/*"]),