forked from ungleich-public/cdist
		
	[type/__postgres_conf] Refactor
This commit is contained in:
		
					parent
					
						
							
								b4060720dc
							
						
					
				
			
			
				commit
				
					
						1b49fec972
					
				
			
		
					 3 changed files with 180 additions and 57 deletions
				
			
		
							
								
								
									
										42
									
								
								cdist/conf/type/__postgres_conf/explorer/context
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										42
									
								
								cdist/conf/type/__postgres_conf/explorer/context
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,42 @@
 | 
				
			||||||
 | 
					#!/bin/sh -e
 | 
				
			||||||
 | 
					# -*- mode: sh; indent-tabs-mode: t -*-
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# 2021 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# 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/>.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# Returns the "context" of the configuration setting.
 | 
				
			||||||
 | 
					# cf. also https://www.postgresql.org/docs/10/view-pg-settings.html
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					os=$("${__explorer:?}/os")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					case ${os}
 | 
				
			||||||
 | 
					in
 | 
				
			||||||
 | 
						(openbsd)
 | 
				
			||||||
 | 
							postgres_user='_postgresql'
 | 
				
			||||||
 | 
							;;
 | 
				
			||||||
 | 
						(devuan)
 | 
				
			||||||
 | 
							postgres_user='postgres'
 | 
				
			||||||
 | 
							;;
 | 
				
			||||||
 | 
						(*)
 | 
				
			||||||
 | 
							echo "Unsupported OS: ${os}" >&2
 | 
				
			||||||
 | 
							exit 1
 | 
				
			||||||
 | 
							;;
 | 
				
			||||||
 | 
					esac
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					conf_name=${__object_id:?}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					su - "${postgres_user}" -c "psql postgres -twAc \"SELECT context FROM pg_settings WHERE name = '${conf_name}'\""
 | 
				
			||||||
							
								
								
									
										60
									
								
								cdist/conf/type/__postgres_conf/explorer/state
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										60
									
								
								cdist/conf/type/__postgres_conf/explorer/state
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,60 @@
 | 
				
			||||||
 | 
					#!/bin/sh -e
 | 
				
			||||||
 | 
					# -*- mode: sh; indent-tabs-mode: t -*-
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# 2021 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# 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/>.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					os=$("${__explorer:?}/os")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					case ${os}
 | 
				
			||||||
 | 
					in
 | 
				
			||||||
 | 
						(openbsd)
 | 
				
			||||||
 | 
							postgres_user='_postgresql'
 | 
				
			||||||
 | 
							;;
 | 
				
			||||||
 | 
						(devuan)
 | 
				
			||||||
 | 
							postgres_user='postgres'
 | 
				
			||||||
 | 
							;;
 | 
				
			||||||
 | 
						(*)
 | 
				
			||||||
 | 
							echo "Unsupported OS: ${os}" >&2
 | 
				
			||||||
 | 
							exit 1
 | 
				
			||||||
 | 
							;;
 | 
				
			||||||
 | 
					esac
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					conf_name=${__object_id:?}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if su - "${postgres_user}" -c "psql postgres -twAc 'SHOW ${conf_name}'" \
 | 
				
			||||||
 | 
						| cmp -s "${__object:?}/parameter/value" -
 | 
				
			||||||
 | 
					then
 | 
				
			||||||
 | 
						echo present
 | 
				
			||||||
 | 
					else
 | 
				
			||||||
 | 
						case $(su - "${postgres_user}" -c "psql postgres -tAwc \"SELECT source FROM pg_settings WHERE name = '${conf_name}'\"")
 | 
				
			||||||
 | 
						in
 | 
				
			||||||
 | 
							('')
 | 
				
			||||||
 | 
								# invalid configuration parameter
 | 
				
			||||||
 | 
								# (error message was already printed by SHOW command above.
 | 
				
			||||||
 | 
								#  Yes, it's a hack)
 | 
				
			||||||
 | 
								exit 1
 | 
				
			||||||
 | 
								;;
 | 
				
			||||||
 | 
							(default)
 | 
				
			||||||
 | 
								echo absent
 | 
				
			||||||
 | 
								;;
 | 
				
			||||||
 | 
							(*)
 | 
				
			||||||
 | 
								echo different
 | 
				
			||||||
 | 
								;;
 | 
				
			||||||
 | 
						esac
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
#!/bin/sh -e
 | 
					#!/bin/sh -e
 | 
				
			||||||
# -*- mode: sh; indent-tabs-mode: t -*-
 | 
					# -*- mode: sh; indent-tabs-mode: t -*-
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 | 
					# 2019-2021 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 | 
				
			||||||
# 2020 Beni Ruef (bernhard.ruef at ssrq-sds-fds.ch)
 | 
					# 2020 Beni Ruef (bernhard.ruef at ssrq-sds-fds.ch)
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# This file is part of cdist.
 | 
					# This file is part of cdist.
 | 
				
			||||||
| 
						 | 
					@ -21,71 +21,92 @@
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
os=$(cat "${__global:?}/explorer/os")
 | 
					os=$(cat "${__global:?}/explorer/os")
 | 
				
			||||||
 | 
					state_is=$(cat "${__object:?}/explorer/state")
 | 
				
			||||||
state_should=$(cat "${__object:?}/parameter/state")
 | 
					state_should=$(cat "${__object:?}/parameter/state")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ "${state_should}" != 'present' ] && [ "${state_should}" != 'absent' ]
 | 
					conf_name=${__object_id:?}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if test "${state_is}" = "${state_should}"
 | 
				
			||||||
then
 | 
					then
 | 
				
			||||||
	echo "Invalid state '${state_should}'." \
 | 
						exit 0
 | 
				
			||||||
	     'Only "present" and "absent" are acceptable' >&2
 | 
					 | 
				
			||||||
	exit 1
 | 
					 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ "${state_should}" = 'present' ] && [ ! -f "${__object}/parameter/value" ]
 | 
					quote() {
 | 
				
			||||||
then
 | 
						for _arg
 | 
				
			||||||
	echo 'Missing required parameter "value"' >&2
 | 
						do
 | 
				
			||||||
	exit 1
 | 
							shift
 | 
				
			||||||
fi
 | 
							if test -n "$(printf '%s' "${_arg}" | tr -d -c '\t\n \042-\047\050-\052\073-\077\133\\`|~' | tr -c '' '.')"
 | 
				
			||||||
 | 
					 | 
				
			||||||
# Parameters
 | 
					 | 
				
			||||||
conf_name="${__object_id:?}"
 | 
					 | 
				
			||||||
if [ -f "${__object}/parameter/value" ]
 | 
					 | 
				
			||||||
then
 | 
					 | 
				
			||||||
	conf_value=$(cat "${__object}/parameter/value")
 | 
					 | 
				
			||||||
fi
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
if [ "${state_should}" = 'present' ]
 | 
					 | 
				
			||||||
then
 | 
					 | 
				
			||||||
	set_command="ALTER SYSTEM SET ${conf_name} = ${conf_value}"
 | 
					 | 
				
			||||||
else
 | 
					 | 
				
			||||||
	set_command="ALTER SYSTEM SET ${conf_name} = DEFAULT"
 | 
					 | 
				
			||||||
fi
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
case $os
 | 
					 | 
				
			||||||
in
 | 
					 | 
				
			||||||
	openbsd|devuan)
 | 
					 | 
				
			||||||
		case $os
 | 
					 | 
				
			||||||
		in
 | 
					 | 
				
			||||||
			openbsd)
 | 
					 | 
				
			||||||
				postgres_user='_postgresql'
 | 
					 | 
				
			||||||
				restart_command='/etc/rc.d/postgresql restart'
 | 
					 | 
				
			||||||
				;;
 | 
					 | 
				
			||||||
			devuan)
 | 
					 | 
				
			||||||
				postgres_user='postgres'
 | 
					 | 
				
			||||||
				restart_command='/etc/init.d/postgresql restart'
 | 
					 | 
				
			||||||
				;;
 | 
					 | 
				
			||||||
		esac
 | 
					 | 
				
			||||||
		# needs two separate psql commands because ALTER SYSTEM
 | 
					 | 
				
			||||||
		# cannot run inside a transaction block
 | 
					 | 
				
			||||||
		cat <<-EOF
 | 
					 | 
				
			||||||
		su - ${postgres_user} -c "psql postgres -qwc \
 | 
					 | 
				
			||||||
			\"${set_command}\""
 | 
					 | 
				
			||||||
		su - ${postgres_user} -c "psql postgres -twAc \
 | 
					 | 
				
			||||||
			\"SELECT pg_reload_conf()\""
 | 
					 | 
				
			||||||
		EOF
 | 
					 | 
				
			||||||
		# check success (makes only sense if setting to a non-default value)
 | 
					 | 
				
			||||||
		# and restart server if needed
 | 
					 | 
				
			||||||
		if [ "${state_should}" = 'present' ]
 | 
					 | 
				
			||||||
		then
 | 
							then
 | 
				
			||||||
			cat <<-EOF
 | 
								# needs quoting
 | 
				
			||||||
			if [ \$(su - ${postgres_user} -c "psql postgres -twAc \"SHOW ${conf_name}\"") != '${conf_value}' ]
 | 
								set -- "$@" "'$(printf '%s' "${_arg}" | sed -e "s/'/'\\\\''/g")'"
 | 
				
			||||||
			then
 | 
							else
 | 
				
			||||||
				${restart_command}
 | 
								set -- "$@" "${_arg}"
 | 
				
			||||||
			fi
 | 
					 | 
				
			||||||
			EOF
 | 
					 | 
				
			||||||
		fi
 | 
							fi
 | 
				
			||||||
 | 
						done
 | 
				
			||||||
 | 
						unset _arg
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						# NOTE: Use printf because POSIX echo interprets escape sequences
 | 
				
			||||||
 | 
						printf '%s' "$*"
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					case ${os}
 | 
				
			||||||
 | 
					in
 | 
				
			||||||
 | 
						(openbsd)
 | 
				
			||||||
 | 
							postgres_user='_postgresql'
 | 
				
			||||||
 | 
							restart_command='/etc/rc.d/postgresql restart'
 | 
				
			||||||
		;;
 | 
							;;
 | 
				
			||||||
	*)
 | 
						(devuan)
 | 
				
			||||||
 | 
							postgres_user='postgres'
 | 
				
			||||||
 | 
							restart_command='/etc/init.d/postgresql restart'
 | 
				
			||||||
 | 
							;;
 | 
				
			||||||
 | 
						(*)
 | 
				
			||||||
		echo "Unsupported OS: ${os}" >&2
 | 
							echo "Unsupported OS: ${os}" >&2
 | 
				
			||||||
		exit 1
 | 
							exit 1
 | 
				
			||||||
		;;
 | 
							;;
 | 
				
			||||||
esac
 | 
					esac
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					psql_cmd() {
 | 
				
			||||||
 | 
						printf 'su - %s -c %s\n' "$(quote "${postgres_user}")" "$(quote "$(quote psql "$@")")"
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					case ${state_should}
 | 
				
			||||||
 | 
					in
 | 
				
			||||||
 | 
						(present)
 | 
				
			||||||
 | 
							test -s "${__object:?}/parameter/value" || {
 | 
				
			||||||
 | 
								echo 'Missing required parameter --value' >&2
 | 
				
			||||||
 | 
								exit 1
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							cat <<-EOF
 | 
				
			||||||
 | 
							exec 3< "\${__object:?}/parameter/value"
 | 
				
			||||||
 | 
							$(psql_cmd postgres -tAw) <<'SQL'
 | 
				
			||||||
 | 
							\\set conf_value \`cat <&3\`
 | 
				
			||||||
 | 
							ALTER SYSTEM SET ${conf_name} = :'conf_value';
 | 
				
			||||||
 | 
							SELECT pg_reload_conf();
 | 
				
			||||||
 | 
							SQL
 | 
				
			||||||
 | 
							exec 3<&-
 | 
				
			||||||
 | 
							EOF
 | 
				
			||||||
 | 
							;;
 | 
				
			||||||
 | 
						(absent)
 | 
				
			||||||
 | 
							psql_cmd postgres -qwc "ALTER SYSTEM SET ${conf_name} TO DEFAULT"
 | 
				
			||||||
 | 
							;;
 | 
				
			||||||
 | 
						(*)
 | 
				
			||||||
 | 
							printf 'Invalid --state: %s\n' "${state_should}" >&2
 | 
				
			||||||
 | 
							printf 'Only "present" and "absent" are acceptable.\n' >&2
 | 
				
			||||||
 | 
							exit 1
 | 
				
			||||||
 | 
							;;
 | 
				
			||||||
 | 
					esac
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# check success (makes only sense if setting to a non-default value)
 | 
				
			||||||
 | 
					# and restart server if needed
 | 
				
			||||||
 | 
					if test "${state_should}" = 'present'
 | 
				
			||||||
 | 
					then
 | 
				
			||||||
 | 
						cat <<-EOF
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						$(psql_cmd postgres -twAc "SHOW ${conf_name}") \\
 | 
				
			||||||
 | 
						| cmp -s "\${__object:?}/parameter/value" - || {
 | 
				
			||||||
 | 
							${restart_command}
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						EOF
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue