openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File setup_py.diff of Package cobbler (Revision f9889d97f4b4e02e8bec00cba1dcbaf4)

Currently displaying revision f9889d97f4b4e02e8bec00cba1dcbaf4 , Show latest

Index: setup.py
===================================================================
--- setup.py.orig
+++ setup.py
@@ -124,12 +124,15 @@ if __name__ == "__main__":
 
     if os.path.exists("/etc/SuSE-release"):
         webconfig  = "/etc/apache2/conf.d"
+        vhostconfig = "/etc/apache2/vhosts.d"
         webroot     = "/srv/www/"
     elif os.path.exists("/etc/debian_version"):
         webconfig  = "/etc/apache2/conf.d"
+        vhostconfig = "/etc/apache2/conf.d"
         webroot     = "/usr/share/cobbler/webroot/"
     else:
         webconfig  = "/etc/httpd/conf.d"
+        vhostconfig = "/etc/apache2/conf.d"
         webroot     = "/var/www/"
 
     webcontent  = webroot + "cobbler_webui_content/"
@@ -169,7 +172,7 @@ if __name__ == "__main__":
             ("/usr/sbin", ["scripts/tftpd.py"]),
 
             ("%s" % webconfig,              ["config/cobbler.conf"]),
-            ("%s" % webconfig,              ["config/cobbler_web.conf"]),
+            ("%s" % vhostconfig,            ["config/cobbler_web.conf"]),
             ("%s" % initpath,               ["config/cobblerd"]),
             ("%s" % docpath,                ["docs/*.gz"]),
             ("installer_templates",         ["installer_templates/*"]),

Places

File setup_py.diff of Package cobbler (Revision f9889d97f4b4e02e8bec00cba1dcbaf4)

Places