Skip to content

ENT-13234: Various fixes to CFEngine sysvinit scripts #5876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ENT-13234: Various fixes to CFEngine sysvinit scripts #5876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff6192
Added sysvinit cf-php-fpm service script for Mission Portal
craigcomstock Sep 10, 2025
b66efc9
Removed useless output from cfengine3 init script
craigcomstock Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions misc/init.d/cf-php-fpm.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#! /bin/sh
# copied from /etc/init.d/procps written by Elrond <Elrong@Wunder-Nett.org>
# kFreeBSD do not accept scripts as interpreters, using #!/bin/sh and sourcing.
if [ true != "$INIT_D_SCRIPT_SOURCED" ] ; then
set "$0" "$@"; INIT_D_SCRIPT_SOURCED=true . /lib/init/init-d-script
fi
### BEGIN INIT INFO
# Provides: cf-php-fpm
# Required-Start:
# Required-Stop:
# Should-Start:
# X-Start-Before:
# Default-Start: S
# Default-Stop:
# Short-Description: Start CFEngine Mission Portal php-fpm service
# Description: CFEngine Enterprise PHP FastCGI Process Manager
### END INIT INFO

# shellcheck disable=SC2034
DESC=cf-php-fpm
PREFIX=${CFTEST_PREFIX:-@workdir@}
DAEMON=$PREFIX/httpd/php/sbin/php-fpm
PIDFILE=$PREFIX/httpd/php-fpm.pid

do_start_cmd() {
STATUS=0
"$DAEMON" --pid "$PIDFILE" --force-stderr || STATUS="$?"
return $STATUS
}

do_stop_cmd() {
if [ -f "$PIDFILE" ]; then
kill -9 "-$(cat "$PIDFILE")"
fi
}
2 changes: 1 addition & 1 deletion misc/init.d/cfengine3.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ fi
CURRENT_PS_UID=__none__
INSIDE_CONTAINER=-1

if ps --help 2>/dev/null | egrep -e '--cols\b' > /dev/null || ps --help output 2>/dev/null | egrep -e '--cols\b'; then
if ps --help 2>/dev/null | egrep -e '--cols\b' > /dev/null || ps --help output 2>/dev/null | egrep -e '--cols\b' > /dev/null; then
# There is a bug in SUSE which means that ps output will be truncated even
# when piped to grep, if the terminal size is small. However using --cols
# will override it. NOTE: On Suse 12 and 15, `ps` mentions `--cols` only
Expand Down
Loading