forked from ungleich-public/cdist
remove obsolete todos ... people believe they still need to be fixed!
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
parent
104b9ce5d1
commit
c6ad2e60b3
3 changed files with 24 additions and 13 deletions
|
@ -1,5 +1,24 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# 2013 Steven Armstrong (steven-cdist at armstrong.cc)
|
#
|
||||||
|
# 2013 Steven Armstrong (steven-cdist armstrong.cc)
|
||||||
|
# 2014 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 <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
file="$(cat "$__object/parameter/file" 2>/dev/null || echo "/$__object_id")"
|
file="$(cat "$__object/parameter/file" 2>/dev/null || echo "/$__object_id")"
|
||||||
|
|
||||||
|
@ -8,12 +27,12 @@ file="$(cat "$__object/parameter/file" 2>/dev/null || echo "/$__object_id")"
|
||||||
|
|
||||||
prefix=$(cat "$__object/parameter/prefix" 2>/dev/null || echo "#cdist:__block/$__object_id")
|
prefix=$(cat "$__object/parameter/prefix" 2>/dev/null || echo "#cdist:__block/$__object_id")
|
||||||
suffix=$(cat "$__object/parameter/suffix" 2>/dev/null || echo "#/cdist:__block/$__object_id")
|
suffix=$(cat "$__object/parameter/suffix" 2>/dev/null || echo "#/cdist:__block/$__object_id")
|
||||||
awk -v prefix="$prefix" -v suffix="$suffix" '{
|
awk -v prefix="^$prefix\$" -v suffix="^$suffix\$" '{
|
||||||
if (index($0,prefix)) {
|
if (match($0,prefix)) {
|
||||||
triggered=1
|
triggered=1
|
||||||
}
|
}
|
||||||
if (triggered) {
|
if (triggered) {
|
||||||
if (index($0,suffix)) {
|
if (match($0,suffix)) {
|
||||||
triggered=0
|
triggered=0
|
||||||
}
|
}
|
||||||
print
|
print
|
||||||
|
|
|
@ -46,7 +46,7 @@ tmpfile=\$(mktemp ${file}.cdist.XXXXXXXXXX)
|
||||||
if [ -f "$file" ]; then
|
if [ -f "$file" ]; then
|
||||||
cp -p "$file" "\$tmpfile"
|
cp -p "$file" "\$tmpfile"
|
||||||
fi
|
fi
|
||||||
awk -v prefix="$prefix" -v suffix="$suffix" '
|
awk -v prefix="^$prefix\\\$" -v suffix="^$suffix\\\$" '
|
||||||
{
|
{
|
||||||
if (index(\$0,prefix)) {
|
if (index(\$0,prefix)) {
|
||||||
triggered=1
|
triggered=1
|
||||||
|
|
|
@ -5,10 +5,6 @@ Feel free to pick one!
|
||||||
|
|
||||||
CORE
|
CORE
|
||||||
----
|
----
|
||||||
- support default parameter
|
|
||||||
- document and add paremeters for remote-copy and remote-exec!
|
|
||||||
- remove hack, make a feature of it
|
|
||||||
|
|
||||||
- remove var=foo calls on remote side. Use -o SendEnv (yeah, see ssh_config(5))
|
- remove var=foo calls on remote side. Use -o SendEnv (yeah, see ssh_config(5))
|
||||||
|
|
||||||
TESTS
|
TESTS
|
||||||
|
@ -23,9 +19,6 @@ TESTS
|
||||||
|
|
||||||
USER INTERFACE
|
USER INTERFACE
|
||||||
--------------
|
--------------
|
||||||
- How to cleanly implement "restart service if config file changed"
|
|
||||||
-> document
|
|
||||||
|
|
||||||
- Cache
|
- Cache
|
||||||
- add example how to use
|
- add example how to use
|
||||||
- export variable $__cache
|
- export variable $__cache
|
||||||
|
@ -45,7 +38,6 @@ TYPES
|
||||||
- Add testing framework (proposed by Evax Software)
|
- Add testing framework (proposed by Evax Software)
|
||||||
- __user
|
- __user
|
||||||
add option to include --create-home
|
add option to include --create-home
|
||||||
- Merge __addifnosuchline and __removeline into __line + --state present|absent
|
|
||||||
- __cron: Support --file to be used instead of user cron (probably direct support
|
- __cron: Support --file to be used instead of user cron (probably direct support
|
||||||
of /etc/cron.d)
|
of /etc/cron.d)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue