Merge branch '1.4.x'

Conflicts:
	debian/bcfg2-server.install
	doc/server/plugins/grouping/metadata.txt
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Tools/Portage.py
	src/lib/Bcfg2/Client/Tools/RcUpdate.py
	src/lib/Bcfg2/Client/Tools/YUM24.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Client/Tools/launchd.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	src/lib/Bcfg2/Utils.py
	src/sbin/bcfg2-info
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 0 insertions, 80 deletions

diff --git a/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/host.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/host.html
deleted file mode 100644
index d6b8873bc..000000000
--- a/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/host.html
+++ /dev/null
@@ -1,80 +0,0 @@
-{% extends "base.html" %}
-
-{% block pagebanner %}
-  <div class="header">
-      <h2>{{ host.hostname }}</h2>
-  </div>
-  <br/>
-{% endblock %}
-
-{% block sidebar %}
-{% include "navbar.tmpl" %}
-<ul class="sidebar">
-   <li><a href="dns/" class="sidebar">detailed dns info</a></li>
-   <li><a href="edit/" class="sidebar">edit host info</a></li>
-   <li><a href="dns/edit/" class="sidebar">edit dns info</a></li>
-   <li><a href="logs/" class="sidebar">change logs</a></li>
-</ul>
-{% include "logout.tmpl" %}
-{% endblock %}
-
-{% block content %}
-
-<table border="0" width="100%">
-   <colgroup>
-   <col width="150">
-   <col width="*">
-   <tr> <td> <b>hostname</b></td>
-   <td> {{ host.hostname }}</td></tr>
-   <tr> <td> <b>whatami</b></td>
-   <td> {{ host.whatami }}</td></tr>
-   <tr> <td> <b>netgroup</b></td>
-   <td> {{ host.netgroup }}</td></tr>
-   <tr> <td> <b>class</b></td>
-   <td> {{ host.security_class }}</td></tr>
-   <tr> <td> <b>support</b></td>
-   <td> {{ host.support }}</td></tr>
-   <tr> <td> <b>csi</b></td>
-   <td> {{ host.csi }}</td></tr>
-   <tr> <td> <b>printq</b></td>
-   <td> {{ host.printq }}</td></tr>
-   <tr> <td> <b>outbound_smtp</b></td>
-   {% if host.outbound_smtp %}
-   <td> y </td></tr>
-   {% else %}
-   <td> n </td></tr>
-   {% endif %}
-   <tr> <td> <b>primary_user</b></td>
-   <td> {{ host.primary_user }}</td></tr>
-   <tr> <td> <b>administrator</b></td>
-   <td> {{ host.administrator }}</td></tr>
-   <tr> <td> <b>location</b></td>
-   <td> {{ host.location }}</td></tr>
-   <tr> <td> <b>expiration_date</b></td>
-   <td> {{ host.expiration_date }}</td></tr>
-   {% for interface in host.inserface_set.all %}
-   <tr> <td><br><b>Interface</b></td>
-   {% ifnotequal interface.0.hdwr_type 'no' %}
-   <td><br>{{ interface.0.hdwr_type }}</td></tr>
-   {% endifnotequal %}
-   {% if interface.0.dhcp %}
-   <tr> <td> <b>mac_addr</b></td>
-   <td> {{ interface.0.mac_addr }}</b></td></tr>
-   {% endif %}
-   {% for ip in interface.1 %}
-   <tr> <td> <b>ip_addr</b></td>
-   <td> {{ ip.ip_addr }}</td></tr>
-   {% endfor %}
-   {% endfor %}
-   <tr> <td valign="top"> <b>comments</b></td>
-   <td>
-   {{ host.comments|linebreaksbr }}<br>
-   </td></tr>
-
-</table>
-<a style="font-size:75%" href="/hostbase/{{ host.id }}/dns/">see detailed DNS information for this host</a>
-<br><br>
-this host is {{ host.status }}<br>
-last update on {{ host.last }}<br>
-
-{% endblock %}