From: Aurelien Jarno Date: Mon, 1 Apr 2019 10:53:58 +0000 (+0200) Subject: Remove kfreebsd left-over X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a516268b2f85b0faa6d90832290c3bafd1f4bf45;p=mirror%2Fdsa-puppet.git Remove kfreebsd left-over --- diff --git a/modules/debian_org/lib/facter/lsb-for-bsd.rb b/modules/debian_org/lib/facter/lsb-for-bsd.rb deleted file mode 100644 index c95d7f2eb..000000000 --- a/modules/debian_org/lib/facter/lsb-for-bsd.rb +++ /dev/null @@ -1,24 +0,0 @@ -{ "LSBRelease" => %r{^LSB Version:\t(.*)$}, - "LSBDistId" => %r{^Distributor ID:\t(.*)$}, - "LSBDistRelease" => %r{^Release:\t(.*)$}, - "LSBDistDescription" => %r{^Description:\t(.*)$}, - "LSBDistCodeName" => %r{^Codename:\t(.*)$} -}.each do |fact, pattern| - Facter.add(fact) do - confine :kernel => 'GNU/kFreeBSD' - setcode do - unless defined?(lsbdata) and defined?(lsbtime) and (Time.now.to_i - lsbtime.to_i < 5) - type = nil - lsbtime = Time.now - lsbdata = Facter::Util::Resolution.exec('lsb_release -a 2>/dev/null') - end - - if pattern.match(lsbdata) - $1 - else - nil - end - end - end -end - diff --git a/modules/debian_org/lib/facter/os-for-bsd.rb b/modules/debian_org/lib/facter/os-for-bsd.rb deleted file mode 100644 index 77cad42ec..000000000 --- a/modules/debian_org/lib/facter/os-for-bsd.rb +++ /dev/null @@ -1,8 +0,0 @@ -Facter.add(:operatingsystem) do - confine :kernel => 'GNU/kFreeBSD' - setcode do - if FileTest.exists?("/etc/debian_version") - "Debian" - end - end -end diff --git a/modules/kfreebsd/files/dsa-killruby b/modules/kfreebsd/files/dsa-killruby deleted file mode 100644 index 8fcb56c68..000000000 --- a/modules/kfreebsd/files/dsa-killruby +++ /dev/null @@ -1,10 +0,0 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## - -# every hour, kill all puppet jobs that are lingering around, i.e. all -# processes whose parent is init, and who have lived for longer than an hour -# (if they lived for 10 hours then they get to live an hour longer because -# the regex is just that gracious. -12 * * * * root pgrep -P 1 -f '/usr/bin/ruby1.8 /usr/sbin/puppetd -o --no-daemonize' | xargs --no-run-if-empty ps --no-headers -o pid,etime | grep '[1-9]:..:..$' | awk '{print $1}' | xargs --no-run-if-empty kill -9 diff --git a/modules/kfreebsd/files/procps.init b/modules/kfreebsd/files/procps.init deleted file mode 100755 index 4b1e5aeee..000000000 --- a/modules/kfreebsd/files/procps.init +++ /dev/null @@ -1,61 +0,0 @@ -#! /bin/sh -# /etc/init.d/procps: Set kernel variables from /etc/sysctl.conf - -# written by Stephen Gran based on work by Elrond - -### BEGIN INIT INFO -# Provides: procps -# Required-Start: mountkernfs $local_fs -# Required-Stop: -# X-Start-Before: networking -# Default-Start: S -# Default-Stop: -# Short-Description: Configure kernel parameters at boottime -# Description: Loads kernel parameters that are specified in /etc/sysctl.conf -### END INIT INFO - -PATH=/sbin:/bin - -SYSCTL=/bin/sysctl - -test -x $SYSCTL || exit 0 - -. /lib/lsb/init-functions - -# Comment this out for sysctl to print every item changed -QUIET_SYSCTL="-q" - -# Check for existance of the default file -if [ -f /etc/default/rcS ] ; then - . /etc/default/rcS -fi - -set -e - -VERBOSE=yes -case "$1" in - start|restart|force-reload) - log_action_begin_msg "Setting kernel variables " - STATUS=0 - for file in /etc/sysctl.conf /etc/sysctl.d/*.conf ; do - if [ -r "$file" ] ; then - if [ "$VERBOSE" = "yes" ] ; then - log_action_cont_msg " $file" - fi - egrep -v '^[[:space:]]*(#|$)' "$file" | while read line; do - $SYSCTL $QUIET_SYSCTL "$(echo $line | sed -e 's/ = /=/')" - done - fi - done - log_action_end_msg $STATUS - ;; - stop) - ;; - *) - echo "Usage: /etc/init.d/procps {start|stop|restart|force-reload}" >&2 - exit 3 - ;; -esac - -exit 0 -