From b1b86b2ebfbb321060b293f2fa25bd11228d8072 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 20 Sep 2012 17:46:03 +0200 Subject: [PATCH] remove __addifnosuchline and __removeline in 2.1 branch Signed-off-by: Nico Schottelius --- conf/type/__addifnosuchline/explorer/findline | 48 ----------------- conf/type/__addifnosuchline/gencode-remote | 33 ------------ conf/type/__addifnosuchline/man.text | 52 ------------------- conf/type/__addifnosuchline/manifest | 1 - .../type/__addifnosuchline/parameter/optional | 2 - .../type/__addifnosuchline/parameter/required | 1 - conf/type/__removeline/gencode-remote | 31 ----------- conf/type/__removeline/man.text | 50 ------------------ conf/type/__removeline/manifest | 1 - conf/type/__removeline/parameter/optional | 1 - conf/type/__removeline/parameter/required | 1 - 11 files changed, 221 deletions(-) delete mode 100755 conf/type/__addifnosuchline/explorer/findline delete mode 100755 conf/type/__addifnosuchline/gencode-remote delete mode 100644 conf/type/__addifnosuchline/man.text delete mode 100644 conf/type/__addifnosuchline/manifest delete mode 100644 conf/type/__addifnosuchline/parameter/optional delete mode 100644 conf/type/__addifnosuchline/parameter/required delete mode 100755 conf/type/__removeline/gencode-remote delete mode 100644 conf/type/__removeline/man.text delete mode 100644 conf/type/__removeline/manifest delete mode 100644 conf/type/__removeline/parameter/optional delete mode 100644 conf/type/__removeline/parameter/required diff --git a/conf/type/__addifnosuchline/explorer/findline b/conf/type/__addifnosuchline/explorer/findline deleted file mode 100755 index b45bd6ea..00000000 --- a/conf/type/__addifnosuchline/explorer/findline +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# -# 2010-2011 Daniel Roth (dani-cdist@d-roth.li) -# 2011 Nico Schottelius (nico-cdist at schottelius.org) -# -# This file is part of cdist. -# -# cdist 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. -# -# cdist 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 cdist. If not, see . -# -# - -if [ -f "$__object/parameter/file" ]; then - file=$(cat "$__object/parameter/file") -else - file="/$__object_id" -fi - -if [ -f "$__object/parameter/regex" ]; then - regex=$(cat "$__object/parameter/regex") -else - wrap=$(cat "$__object/parameter/line") - regex="^$wrap\$" -fi - -if [ -f "$file" ]; then - # sh -e is our environment, we know what we do, - # skip error detection for now - set +e - grep -q "$regex" "$file" - if [ $? -eq 1 ]; then - echo "NOTFOUND" - else - echo "FOUND" - fi -else - echo "NOTFOUND" -fi diff --git a/conf/type/__addifnosuchline/gencode-remote b/conf/type/__addifnosuchline/gencode-remote deleted file mode 100755 index 1276e5d0..00000000 --- a/conf/type/__addifnosuchline/gencode-remote +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# 2010-2011 Daniel Roth (dani-cdist@d-roth.li) -# -# This file is part of cdist. -# -# cdist 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. -# -# cdist 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 cdist. If not, see . -# -# - -if [ -f "$__object/parameter/file" ]; then - file=$(cat "$__object/parameter/file") -else - file="/$__object_id" -fi - -result=$(cat "$__object/explorer/findline") - -if [ "$result" = "NOTFOUND" ]; then - line=$(cat "$__object/parameter/line") - echo "echo \"$line\" >> $file" -fi diff --git a/conf/type/__addifnosuchline/man.text b/conf/type/__addifnosuchline/man.text deleted file mode 100644 index ba3825ff..00000000 --- a/conf/type/__addifnosuchline/man.text +++ /dev/null @@ -1,52 +0,0 @@ -cdist-type__addifnosuchline(7) -============================== -Daniel Roth - - -NAME ----- -cdist-type__addifnosuchline - Add a line (if not existing already) - - -DESCRIPTION ------------ -This type can be used to check a file for existence of a -specific line and adding it, if it was not found. - - -REQUIRED PARAMETERS -------------------- -line:: - Specifies the content which shall be added if not existing. - - -OPTIONAL PARAMETERS -------------------- -file:: - If supplied, use this as the destination file. - Otherwise the object_id is used. -regex:: - If supplied, search for this regex. - Otherwise entire line must be matched. - -EXAMPLES --------- - --------------------------------------------------------------------------------- -# Creates or appends the line specified in "include_www" to the file "lighttpd.conf" -__addifnosuchline www --file /etc/lighttpd.conf --line include_www - -# Adds the line "include_git" to the file "lighttpd.conf" -__addifnosuchline /etc/lighttpd.conf --line include_git --------------------------------------------------------------------------------- - - -SEE ALSO --------- -- cdist-type(7) - - -COPYING -------- -Copyright \(C) 2011 Daniel Roth. Free use of this software is -granted under the terms of the GNU General Public License version 3 (GPLv3). diff --git a/conf/type/__addifnosuchline/manifest b/conf/type/__addifnosuchline/manifest deleted file mode 100644 index ccc82471..00000000 --- a/conf/type/__addifnosuchline/manifest +++ /dev/null @@ -1 +0,0 @@ -echo "WARNING: Type __addifnosuchline is deprecated and will be removed in cdist 2.1. Please use __line instead" >&2 diff --git a/conf/type/__addifnosuchline/parameter/optional b/conf/type/__addifnosuchline/parameter/optional deleted file mode 100644 index 7ecfcde9..00000000 --- a/conf/type/__addifnosuchline/parameter/optional +++ /dev/null @@ -1,2 +0,0 @@ -file -regex diff --git a/conf/type/__addifnosuchline/parameter/required b/conf/type/__addifnosuchline/parameter/required deleted file mode 100644 index a999a0c2..00000000 --- a/conf/type/__addifnosuchline/parameter/required +++ /dev/null @@ -1 +0,0 @@ -line diff --git a/conf/type/__removeline/gencode-remote b/conf/type/__removeline/gencode-remote deleted file mode 100755 index 3ec466b9..00000000 --- a/conf/type/__removeline/gencode-remote +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# 2010-2011 Daniel Roth (dani-cdist@d-roth.li) -# -# This file is part of cdist. -# -# cdist 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. -# -# cdist 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 cdist. If not, see . -# -# - -if [ -f "$__object/parameter/file" ]; then - file=$(cat "$__object/parameter/file") -else - file="/$__object_id" -fi - -line=$(cat "$__object/parameter/line") -echo "ex -c \"/${line}/d|w|q\" \"${file}\" < - - -NAME ----- -cdist-type__removeline - Remove a line (if existing) - - -DESCRIPTION ------------ -This type can be used to check a file for existence of a -specific line and removeing it, if it was found. - - -REQUIRED PARAMETERS -------------------- -line:: - Specifies the content which shall be removed if existing. - - -OPTIONAL PARAMETERS -------------------- -file:: - If supplied, use this as the destination file. - Otherwise the object_id is used. - - -EXAMPLES --------- - --------------------------------------------------------------------------------- -# Removes the line specifiend in "include_www" from the file "lighttpd.conf" -__removeline www --file /etc/lighttpd.conf --line include_www - -# Removes the line "include_git" from the file "lighttpd.conf" -__removeline /etc/lighttpd.conf --line include_git --------------------------------------------------------------------------------- - - -SEE ALSO --------- -- cdist-type(7) - - -COPYING -------- -Copyright \(C) 2011 Daniel Roth. Free use of this software is -granted under the terms of the GNU General Public License version 3 (GPLv3). diff --git a/conf/type/__removeline/manifest b/conf/type/__removeline/manifest deleted file mode 100644 index 63528795..00000000 --- a/conf/type/__removeline/manifest +++ /dev/null @@ -1 +0,0 @@ -echo "WARNING: Type __removeline is deprecated and will be removed in cdist 2.1. Please use __line instead" >&2 diff --git a/conf/type/__removeline/parameter/optional b/conf/type/__removeline/parameter/optional deleted file mode 100644 index f73f3093..00000000 --- a/conf/type/__removeline/parameter/optional +++ /dev/null @@ -1 +0,0 @@ -file diff --git a/conf/type/__removeline/parameter/required b/conf/type/__removeline/parameter/required deleted file mode 100644 index a999a0c2..00000000 --- a/conf/type/__removeline/parameter/required +++ /dev/null @@ -1 +0,0 @@ -line