Change 33185

russell_jackson (Russell C. Jackson (Rusty))
Russell C. Jackson (Rusty) committed this change into //guest/russell_jackson
Request Review
Download .zip
sudoers systemctl path fix, p4login SDP_SKIP_LOGIN, plain p4/p4d bin links, custom journalPrefix support

sudoers: P4_SVC (sdp) and P4_SYSTEMCTL (ansible-sdp) Cmnd_Aliases now grant both
/usr/bin/systemctl and /bin/systemctl for every command, since the two templates
disagreed on which path is real; backup_functions.sh and load_checkpoint.sh now
resolve systemctl once via 'command -v' and invoke that resolved path with sudo
instead of a bare 'sudo systemctl', so the invoked path always matches what's
granted regardless of which one is real on a given box.
p4login/p4login_master: add SDP_SKIP_LOGIN (p4_vars), for sites that keep no
P4USER password on the server and log in manually via a long-lived ticket.
When set, p4login still runs its existing ticket check and fails fast with an
actionable message if no valid ticket is found, but never reads the password
file.
upgrade.sh/mkdirs.sh: add plain 'p4'/'p4d' entry points in /p4/<instance>/bin,
symlinked directly to p4_<instance> and p4d_<instance>_bin (the raw binaries,
not the -vtrack=0/-C1 wrapper), refreshed on every upgrade.
journalPrefix: decouple checkpoint/journal filename construction from the
hardcoded assumption that it always equals $P4SERVER ("p4_<instance>").
p4_vars now derives P4JOURNALPREFIX (full path) and P4CKP_PREFIX (basename) as
a single source of truth -- preferring an explicit override, then the live
value from 'p4 configure show journalPrefix' if a server is reachable
(auto-setting it to the SDP default if unset), falling back to the SDP
default otherwise. backup_functions.sh, load_checkpoint.sh, and
recover_edge.sh now build every checkpoint/journal filename from
P4CKP_PREFIX (or P4JOURNALPREFIX for the few front-door/no -J rotation
paths) instead of $P4SERVER. configurables.cfg's ccheck.sh rule for
journalPrefix is loosened from Exact to Set, so a custom journalPrefix is no
longer fought back to the p4_<instance> convention by 'ccheck.sh -FIX'.
  • Files 11
  • Comments 0
11 edited 0 added 0 deleted
ansible-sdp/roles/perforce-sdp-install/templates/sudoers_perforce_user.j2#2
Loading...
sdp/Server/Unix/p4/common/bin/backup_functions.sh#101
Loading...
sdp/Server/Unix/p4/common/bin/load_checkpoint.sh#3
Loading...
sdp/Server/Unix/p4/common/bin/p4_vars#19
Loading...
sdp/Server/Unix/p4/common/bin/p4login#5
Loading...
sdp/Server/Unix/p4/common/bin/p4login_master#3
Loading...
sdp/Server/Unix/p4/common/bin/recover_edge.sh#17
Loading...
sdp/Server/Unix/p4/common/bin/upgrade.sh#23
Loading...
sdp/Server/Unix/p4/common/config/configurables.cfg#3
Loading...
sdp/Server/Unix/p4/common/etc/sudoers.d/perforce_sudoers.t#2
Loading...
sdp/Server/Unix/setup/mkdirs.sh#67
Loading...
Tip: Use n and p to cycle through the changes.