openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File fhs.diff of Package cobbler (Revision 7123ad207aa64733406b4776d7968f54)

Currently displaying revision 7123ad207aa64733406b4776d7968f54 , Show latest

--- setup.py
+++ setup.py	2011/01/11 12:06:55
@@ -97,15 +97,15 @@
     spool_koan  = "/var/spool/koan"
 
     # www paths
-    wwwpath  = "/var/www/cobbler"
-    if os.path.exists("/etc/SuSE-release"):
+    wwwpath  = "/srv/www/cobbler"
+    if os.path.exists("/etc/apache2"):
         wwwconf  = "/etc/apache2/conf.d"
     elif os.path.exists("/etc/debian_version"):
         wwwconf  = "/etc/apache2/conf.d"
     else:
         wwwconf  = "/etc/httpd/conf.d"
 
-    wwwcon   = "/var/www/cobbler_webui_content"
+    wwwcon   = "/srv/www/cobbler_webui_content"
     vw_localmirror = wwwpath + "/localmirror"
     vw_kickstarts  = wwwpath + "/kickstarts"
     vw_kickstarts_sys  = wwwpath + "/kickstarts_sys"
@@ -132,13 +132,17 @@
     logpath7 = logpath + "/tasks"
 
     # django content
-    dj_config    = "/etc/httpd/conf.d/"
+    if os.path.exists("/etc/apache2"):
+        dj_config    = "/etc/apache2/vhosts.d/"
+    else:
+        dj_config    = "/etc/httpd/vhosts.d/"
+
     dj_templates = "/usr/share/cobbler/web/cobbler_web/templates"
     dj_webui     = "/usr/share/cobbler/web/cobbler_web"
     dj_webui2    = "/usr/share/cobbler/web/cobbler_web/templatetags"
     dj_webui_proj= "/usr/share/cobbler/web"
     dj_sessions  = "/var/lib/cobbler/webui_sessions"
-    dj_js        = "/var/www/cobbler_webui_content/"
+    dj_js        = "/srv/www/cobbler_webui_content/"
 
     setup(
         name="cobbler",

Places

File fhs.diff of Package cobbler (Revision 7123ad207aa64733406b4776d7968f54)

Places