mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-03 21:43:21 +00:00 
			
		
		
		
	puppet: process_fts_updates connects as nagios (or provided username).
It should not use the configured zulip username, but should instead pull from the login user (likely `nagios`), or an explicit alternate provided PostgreSQL username. Failure to do so results in Nagios failures because the `nagios` login does not have permissions to authenticated the `zulip` PostgreSQL user. This requires CI changes, as the install tests install as the `zulip` login username, which allowed Nagios tests to pass previously; with the custom database and username, however, they must be passed to process_fts_updates explicitly when validating the install.
This commit is contained in:
		
				
					committed by
					
						
						Tim Abbott
					
				
			
			
				
	
			
			
			
						parent
						
							9d67e37166
						
					
				
				
					commit
					71b56f7c1c
				
			@@ -5,6 +5,42 @@
 | 
			
		||||
set -e
 | 
			
		||||
set -x
 | 
			
		||||
 | 
			
		||||
usage() {
 | 
			
		||||
    cat <<'EOF'
 | 
			
		||||
Usage:
 | 
			
		||||
  production-verify
 | 
			
		||||
  production-verify --test-custom-db
 | 
			
		||||
  production-verify --help
 | 
			
		||||
 | 
			
		||||
Options:
 | 
			
		||||
  --test-custom-db
 | 
			
		||||
      Use custom database and user names.
 | 
			
		||||
 | 
			
		||||
EOF
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
# Shell option parsing.
 | 
			
		||||
args="$(getopt -o '' --long help,test-custom-db -n "$0" -- "$@")"
 | 
			
		||||
eval "set -- $args"
 | 
			
		||||
NAGIOS_USER="zulip"
 | 
			
		||||
while true; do
 | 
			
		||||
    case "$1" in
 | 
			
		||||
        --help)
 | 
			
		||||
            usage
 | 
			
		||||
            exit 0
 | 
			
		||||
            ;;
 | 
			
		||||
 | 
			
		||||
        --test-custom-db)
 | 
			
		||||
            NAGIOS_USER="zulipcustomuser"
 | 
			
		||||
            shift
 | 
			
		||||
            ;;
 | 
			
		||||
        --)
 | 
			
		||||
            shift
 | 
			
		||||
            break
 | 
			
		||||
            ;;
 | 
			
		||||
    esac
 | 
			
		||||
done
 | 
			
		||||
 | 
			
		||||
cat >>/etc/zulip/settings.py <<EOF
 | 
			
		||||
# CircleCI override settings above
 | 
			
		||||
AUTHENTICATION_BACKENDS = ( 'zproject.backends.EmailAuthBackend', )
 | 
			
		||||
@@ -111,7 +147,7 @@ echo
 | 
			
		||||
echo "Now running additional Nagios tests"
 | 
			
		||||
echo
 | 
			
		||||
if ! /usr/lib/nagios/plugins/zulip_app_frontend/check_queue_worker_errors \
 | 
			
		||||
    || ! su zulip -c "/usr/local/bin/process_fts_updates --nagios-check"; then # || \
 | 
			
		||||
    || ! su zulip -c "/usr/local/bin/process_fts_updates --nagios-check --nagios-user=$NAGIOS_USER"; then # || \
 | 
			
		||||
    #   ! su zulip -c "/usr/lib/nagios/plugins/zulip_app_frontend/check_send_receive_time --site=https://127.0.0.1/api --nagios --insecure"; then
 | 
			
		||||
    set +x
 | 
			
		||||
    echo
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user