From 574688c6e1f27fdcd3cc69c18b7e36506d528b95 Mon Sep 17 00:00:00 2001
From: Darko Poljak <darko.poljak@gmail.com>
Date: Thu, 2 Feb 2017 19:47:02 +0100
Subject: [PATCH] Rm due to new patch from Dmitry.

---
 cdist/conf/type/__hosts/man.rst               | 55 -------------------
 cdist/conf/type/__hosts/manifest              | 49 -----------------
 .../conf/type/__hosts/parameter/default/state |  1 -
 cdist/conf/type/__hosts/parameter/optional    |  2 -
 4 files changed, 107 deletions(-)
 delete mode 100644 cdist/conf/type/__hosts/man.rst
 delete mode 100755 cdist/conf/type/__hosts/manifest
 delete mode 100644 cdist/conf/type/__hosts/parameter/default/state
 delete mode 100644 cdist/conf/type/__hosts/parameter/optional

diff --git a/cdist/conf/type/__hosts/man.rst b/cdist/conf/type/__hosts/man.rst
deleted file mode 100644
index f89a619c..00000000
--- a/cdist/conf/type/__hosts/man.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-cdist-type__hosts(7)
-====================
-
-NAME
-----
-
-cdist-type__hosts - manage entries in /etc/hosts
-
-DESCRIPTION
------------
-
-Add or remove entries from */etc/hosts* file.
-
-OPTIONAL PARAMETERS
--------------------
-
-state
-
-    If state is ``present``, make *object_id* resolve to *ip*. If
-    state is ``absent``, *object_id* will no longer resolve to
-    anything via */etc/hosts*.
-
-ip
-
-    IP address, to which hostname (=\ *object_id*) must resolve. If
-    state is ``present``, this parameter is mandatory, if state is
-    ``absent``, this parameter is silently ignored.
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    # Now `funny' resolves to 192.168.1.76,
-    __hosts funny --ip 192.168.1.76
-    # and `happy' does not resolve (at least via /etc/hosts)
-    __hosts happy --state absent
-
-SEE ALSO
---------
-
-:strong:`hosts`\ (5)
-
-AUTHORS
--------
-
-Dmitry Bogatov <KAction@gnu.org>
-
-
-COPYING
--------
-
-Copyright (C) 2015,2016 Dmitry Bogatov. Free use of this software is granted
-under the terms of the GNU General Public License version 3 or later
-(GPLv3+).
diff --git a/cdist/conf/type/__hosts/manifest b/cdist/conf/type/__hosts/manifest
deleted file mode 100755
index 99a06c09..00000000
--- a/cdist/conf/type/__hosts/manifest
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2015  Bogatov Dmitry <KAction@gnu.org>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-hostname="$__object_id"
-state="$(cat "$__object/parameter/state")"
-
-# First remove all lines for given hostname and then insert again.
-# Otherwise, we risk having multiple entries for same hostname.
-#
-# There is a corner case, which we do not handle. Namely, /etc/hosts
-# format allows several host names on single line, like following:
-#
-#     192.168.15.16 foo bar
-#
-# If this type manages hostname `foo', then hostname bar will get erased.
-
-__line "__hosts/delete/${hostname}" \
-       --state absent               \
-       --regex " ${hostname}[ ]*$"  \
-       --file /etc/hosts
-export require="__line/__hosts/delete/${hostname}"
-
-case "$state" in
-    absent)
-        : # Nothing to do
-        ;;
-    present)
-        ip="$(cat "$__object/parameter/ip")"
-        __line "__hosts/insert/${hostname}" \
-               --line "${ip} ${hostname}"   \
-               --file /etc/hosts
-        ;;
-    *)
-        echo "ERROR: type (${__type##*/}) does not support state \`$state'"
-        exit 1
-esac
diff --git a/cdist/conf/type/__hosts/parameter/default/state b/cdist/conf/type/__hosts/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__hosts/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__hosts/parameter/optional b/cdist/conf/type/__hosts/parameter/optional
deleted file mode 100644
index 411fc5d2..00000000
--- a/cdist/conf/type/__hosts/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-state
-ip