summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raffenetti <raffenet@mcs.anl.gov>2006-11-12 17:47:00 +0000
committerKen Raffenetti <raffenet@mcs.anl.gov>2006-11-12 17:47:00 +0000
commit93f661a2c3cd3282419c5496a0086b7553aceaee (patch)
tree3db902f3a40812ef0e3b79d0e3606602f47fb875
parent3110821ebac31cb59fac2676c40ecd86d0829510 (diff)
downloadbcfg2-93f661a2c3cd3282419c5496a0086b7553aceaee.tar.gz
bcfg2-93f661a2c3cd3282419c5496a0086b7553aceaee.tar.bz2
bcfg2-93f661a2c3cd3282419c5496a0086b7553aceaee.zip
minor changes to make installation easier
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2494 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Server/Hostbase/hostbase/webtemplates/index.html4
-rw-r--r--src/lib/Server/Hostbase/templates/dhcpd.conf.head5
-rw-r--r--src/lib/Server/Hostbase/urls.py1
3 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/index.html b/src/lib/Server/Hostbase/hostbase/webtemplates/index.html
index ca9a250da..0050b9ef2 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/index.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/index.html
@@ -7,8 +7,8 @@
<br/>
{% endblock %}
{% block sidebar %}
-<a href="/login/" class="sidebar">login to hostbase</a>
-<a href="/hostbase/" class="sidebar">search for hosts</a>
+<a href="/login/" class="sidebar">login to hostbase</a><br>
+<a href="/hostbase/" class="sidebar">search for hosts</a><br>
<a href="/zones/" class="sidebar">zone file information</a>
{% endblock %}
{% block content %}
diff --git a/src/lib/Server/Hostbase/templates/dhcpd.conf.head b/src/lib/Server/Hostbase/templates/dhcpd.conf.head
new file mode 100644
index 000000000..a3d19547e
--- /dev/null
+++ b/src/lib/Server/Hostbase/templates/dhcpd.conf.head
@@ -0,0 +1,5 @@
+#
+# dhcpd.conf
+#
+# Configuration file for ISC dhcpd
+#
diff --git a/src/lib/Server/Hostbase/urls.py b/src/lib/Server/Hostbase/urls.py
index dd3d34eaf..e4ed42996 100644
--- a/src/lib/Server/Hostbase/urls.py
+++ b/src/lib/Server/Hostbase/urls.py
@@ -24,6 +24,7 @@ urlpatterns = patterns('Hostbase.hostbase.views',
#fixme: this is a temp. kludge to handle static serving of css, img, js etc...
#a better solution is to use mod_python/apache directives for the static serving
+os.environ['bcfg_media_root'] = '/usr/lib/python2.4/site-packages/Hostbase/media'
urlpatterns += patterns('',
(r'^site_media/(.*)$',