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, 122 deletions

diff --git a/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/copy.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/copy.html
deleted file mode 100644
index 400ef58f2..000000000
--- a/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/copy.html
+++ /dev/null
@@ -1,122 +0,0 @@
-{% extends "base.html" %}
-
-{% block pagebanner %}
-  <div class="header">
-      <h2>new host information</h2>
-  </div>
-  <br/>
-{% endblock %}
-
-{% block sidebar %}
-<a href="/hostbase/" class="sidebar">search hostbase</a>
-{% include "logout.tmpl" %}
-{% endblock %}
-
-{% block content %}
-
-<form name="hostdata" action="?sub=true" method="post">
-<input type="hidden" name="host">
-<table border="0" width="100%">
-   <colgroup>
-   <col width="150">
-   <col width="*">
-   <tr> <td> <b>hostname</b></td>
-   <td> <input name="hostname" type="text" value="{{ host.hostname }}" ></td></tr>
-   <tr> <td> <b>whatami</b></td>
-   <td>
-   <select name="whatami">
-   {% for choice in WHATAMI_CHOICES %}
-   {% ifequal host.whatami choice.0 %}
-   <option value="{{ choice.0 }}" selected="selected" >{{ choice.1 }}
-   {% else %}
-   <option value="{{ choice.0 }}">{{ choice.1 }}
-   {% endifequal %}
-   {% endfor %}
-   </select>
-   </td></tr>
-   <tr> <td> <b>netgroup</b></td>
-   <td>
-   <select name="netgroup">
-   {% for choice in NETGROUP_CHOICES %}
-   {% ifequal host.netgroup choice.0 %}
-   <option value="{{ choice.0 }}" selected="selected" >{{ choice.1 }}
-   {% else %}
-   <option value="{{ choice.0 }}">{{ choice.1 }}
-   {% endifequal %}
-   {% endfor %}
-   </select>
-   </td></tr>
-   <tr> <td> <b>class</b></td>
-   <td>
-   <select name="security_class">
-   {% for choice in CLASS_CHOICES %}
-   {% ifequal host.security_class choice.0 %}
-   <option value="{{ choice.0 }}" selected="selected" >{{ choice.1 }}
-   {% else %}
-   <option value="{{ choice.0 }}">{{ choice.1 }}
-   {% endifequal %}
-   {% endfor %}
-   </select></td></tr>
-   <tr> <td> <b>support</b></td>
-   <td>
-   <select name="support">
-   {% for choice in SUPPORT_CHOICES %}
-   {% ifequal host.support choice.0 %}
-   <option value="{{ choice.0 }}" selected="selected" >{{ choice.1 }}
-   {% else %}
-   <option value="{{ choice.0 }}">{{ choice.1 }}
-   {% endifequal %}
-   {% endfor %}
-   </select></td></tr>
-   <tr> <td> <b>csi</b></td>
-   <td> <input name="csi" type="text" value="{{ host.csi }}" ></td></tr>
-   <tr> <td> <b>printq</b></td>
-   <td> <input name="printq" type="text" value="{{ host.printq }}" ></td></tr>
-   <tr> <td> <b>outbound_smtp</b></td>
-   <td>
-   {% if host.outbound_smtp %}
-   <input type="checkbox" name="outbound_smtp" checked="checked" ></td></tr>
-   {% else %}
-   <input type="checkbox" name="outbound_smtp" ></td></tr>
-   {% endif %}
-   <tr> <td> <b>primary_user</b></td>
-   <td> <input name="primary_user" type="text" size="32" value="{{ host.primary_user }}"> (email address)</td></tr>
-   <tr> <td> <b>administrator</b></td>
-   <td> <input name="administrator" type="text" size="32" value="{{ host.administrator }}"> (email address)</td></tr>
-   <tr> <td> <b>location</b></td>
-   <td> <input name="location" type="text" value="{{ host.location }}"></td></tr>
-   <tr> <td> <b>expiration_date</b></td>
-   <td> <input name="expiration_date" type="text" size="10" value="{{ host.expiration_date }}">YYYY-MM-DD</td></tr>
-   <tr> <td><br><b>Interface</b></td><td><br>
-   {% for choice in TYPE_CHOICES %}
-   <input type="radio" name="hdwr_type_new" value="{{ choice.0 }}" >{{ choice.1 }}
-   {% endfor %}
-   </td></tr>
-   <tr> <td> <b>dhcp</b></td>
-   <td>
-   <input type="checkbox" name="dhcp_new"></td></tr>
-   <tr> <td> <b>mac_addr</b></td>
-   <td> <input name="mac_addr_new" type="text"></td></tr>
-   <tr> <td> <b>ip_addr</b></td>
-   <td> <input name="ip_addr_new" type="text"></td></tr>
-   <tr> <td><br><b>Interface</b></td><td><br>
-   {% for choice in TYPE_CHOICES %}
-   <input type="radio" name="hdwr_type_new2" value="{{ choice.0 }}" >{{ choice.1 }}
-   {% endfor %}
-   </td></tr>
-   <tr> <td> <b>dhcp</b></td>
-   <td>
-   <input type="checkbox" name="dhcp_new2"></td></tr>
-   <tr> <td> <b>mac_addr</b></td>
-   <td> <input name="mac_addr_new2" type="text"></td></tr>
-   <tr> <td> <b>ip_addr</b></td>
-   <td> <input name="ip_addr_new2" type="text"></td></tr>
-   <tr> <td> <b>comments</b></td>
-   <td> <textarea rows="10" cols="50" name="comments"></textarea></td></tr>
-</table>
-<br>
-<p><input type="submit" value="Submit">
-</form>
-
-{% endblock %}
-