Merge pull request #918 from BastilleBSD/tschettervictor-patch-2

template: Add LINE_IN_FILE as HOOK

docs/chapters/template.rst

@@ -23,37 +23,39 @@ template hook commands.
 Template Automation Hooks
 -------------------------
 
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
 | HOOK          | format              | example                                 |
-+=============+=====================+=========================================+
++===============+=====================+=========================================+
 | ARG           | ARG=VALUE           | MINECRAFT_MEMX="1024M"                  |
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
 | CMD           | /bin/sh command     | /usr/bin/chsh -s /usr/local/bin/zsh     |
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
 | CONFIG        | set property value  | set allow.mlock 1                       |
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
 | CP/OVERLAY    | path(s)             | etc root usr (one per line)             |
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
 | INCLUDE       | template path/URL   | http?://TEMPLATE_URL or project/path    |
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
 | LIMITS        | resource value      | memoryuse 1G                            |
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
+| LINE_IN_FILE  | line file_path      | word /usr/local/word/word.conf          |
++---------------+---------------------+-----------------------------------------+
 | MOUNT         | fstab syntax        | /host/path container/path nullfs ro 0 0 |
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
 | OVERLAY       | path(s)             | etc root usr (one per line)             |
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
 | PKG           | port/pkg name(s)    | vim-console zsh git-lite tree htop      |
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
 | RDR           | tcp port port       | tcp 2200 22 (hostport jailport)         |
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
 | RENDER        | /path/file.txt      | /usr/local/etc/gitea/conf/app.ini       |
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
 | RESTART       |                     | (restart jail)                          |
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
 | SERVICE       | service command     | 'nginx start' OR 'postfix reload'       |
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
 | SYSRC         | sysrc command(s)    | nginx_enable=YES                        |
-+-------------+---------------------+-----------------------------------------+
++---------------+---------------------+-----------------------------------------+
 
 Template Hook Descriptions
 --------------------------
@@ -82,6 +84,8 @@ INCLUDE     - specify a template to include. Make sure the template is
 
 LIMITS        - set the specified resource value for the jail
 
+LINE_IN_FILE  - add specified word to specified file if not present
+
 MOUNT         - mount specified files/directories inside the jail
 
 PKG           - install specified packages inside jail

usr/local/share/bastille/template.sh

@@ -114,6 +114,19 @@ render() {
     fi
 }
 
+line_in_file() {
+    _jailpath="${1}"
+    _filepath="$(echo ${2} | awk '{print $2}')"
+    _line="$(echo ${2} | awk '{print $1}')"
+    if [ -f "${_jailpath}/${_filepath}" ]; then
+        if ! grep -qxF "${_line}" "${_jailpath}/${_filepath}"; then
+            echo "${_line}" >> "${_jailpath}/${_filepath}"
+	fi
+    else
+        warn "Path not found for line_in_file: ${_filepath}"
+    fi
+}
+
 # Handle options.
 AUTO=0
 while [ "$#" -gt 0 ]; do
@@ -380,6 +393,10 @@ for _jail in ${JAILS}; do
                     render "${bastille_jail_path}" "${_args}"
                     continue
                     ;;
+                lif|lineinfile|line_in_file)
+                    line_in_file "${bastille_jail_path}" "${_args}"
+                    continue
+                    ;;
             esac
 
             if ! eval "bastille ${_cmd} ${_jail} ${_args}"; then