From cc3118d2e878c0c4692d1b8aab39ddf63ee9f6ea Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sun, 8 Jul 2018 21:02:03 +0200 Subject: [PATCH] Allow config from stdin --- manifest | 19 +++++++++++++++---- parameter/optional | 2 ++ parameter/required | 1 - 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 parameter/optional delete mode 100644 parameter/required diff --git a/manifest b/manifest index 4d35970..50c7623 100644 --- a/manifest +++ b/manifest @@ -1,11 +1,22 @@ config=$(cat "$__object/parameter/config") -srcfile="$__files/nftables/${config}.conf" initscript="$__type/files/nftables-init" -if [ ! -f "$srcfile" ]; then - echo "No such config ${config}. Aborting." >&2 - exit 1 +if [ -f "$__object/parameter/config-from_stdin" ]; then + srcfile="$__object/stdin" +else + if [ ! -f "$__object/parameter/config" ]; then + echo "Need either config-from-stdin or config" >&2 + exit 1 + fi + + srcfile="$__files/nftables/${config}.conf" + + if [ ! -f "$srcfile" ]; then + echo "No such config ${config}. Aborting." >&2 + exit 1 + fi + fi __package nftables diff --git a/parameter/optional b/parameter/optional new file mode 100644 index 0000000..2dba30a --- /dev/null +++ b/parameter/optional @@ -0,0 +1,2 @@ +config +config-from-stdin diff --git a/parameter/required b/parameter/required deleted file mode 100644 index 04204c7..0000000 --- a/parameter/required +++ /dev/null @@ -1 +0,0 @@ -config