This commit is contained in:
do
2013-02-02 14:36:13 +01:00
parent 57b7e4b122
commit aa3fa40310
55 changed files with 0 additions and 2638 deletions

View File

@@ -1,17 +0,0 @@
K 25
svn:wc:ra_dav:version-url
V 82
/dav/ikwadmin/!svn/ver/4356/linux/puppetmaster/etc_puppet/modules/puppet/templates
END
puppetd_run.sh.erb
K 25
svn:wc:ra_dav:version-url
V 101
/dav/ikwadmin/!svn/ver/4177/linux/puppetmaster/etc_puppet/modules/puppet/templates/puppetd_run.sh.erb
END
puppet.conf.erb
K 25
svn:wc:ra_dav:version-url
V 98
/dav/ikwadmin/!svn/ver/4356/linux/puppetmaster/etc_puppet/modules/puppet/templates/puppet.conf.erb
END

View File

@@ -1,96 +0,0 @@
10
dir
4547
https://uwaechte@svn.ikw.uni-osnabrueck.de/dav/ikwadmin/linux/puppetmaster/etc_puppet/modules/puppet/templates
https://uwaechte@svn.ikw.uni-osnabrueck.de/dav/ikwadmin
2011-05-28T15:15:01.096298Z
4356
uwaechte
0e4a7186-e024-0410-a49b-aced43e0d94e
puppetd_run.sh.erb
file
2011-07-25T16:18:40.000000Z
ce618a9916b301525921a51a97088ad7
2011-04-05T08:02:08.474477Z
4177
uwaechte
has-props
1985
puppet.conf.erb
file
2011-07-25T16:18:40.000000Z
b8991541f2f7bded0451572a624d4d22
2011-05-28T15:15:01.096298Z
4356
uwaechte
has-props
1581

View File

@@ -1,5 +0,0 @@
K 12
svn:keywords
V 2
Id
END

View File

@@ -1,9 +0,0 @@
K 14
svn:executable
V 1
*
K 12
svn:keywords
V 2
Id
END

View File

@@ -1,55 +0,0 @@
# $Id$
[main]
confdir=/etc/puppet
logdir=/var/log/puppet
vardir=/var/lib/puppet
ssldir=$vardir/ssl
#yamldir = $vardir/yaml
rundir=/var/run/puppet
factsignore = .svn CVS .git
pluginsync=true
factpath=$vardir/lib/facter
templatedir=/etc/puppet/templates
## should we use this?
#prerun_command=/etc/puppet/etckeeper-commit-pre
#postrun_command=/etc/puppet/etckeeper-commit-post
<% if (fqdn == scope.lookupvar("puppetmaster_server")) || (fqdn == scope.lookupvar("puppetmasterdev_server")) -%>
queue_type = stomp
queue_source = stomp://localhost:61613
dbadapter=mysql
dbmigrate=true
dbname=admin_<%= hostname %>
dbserver=dbserv.ikw.uni-osnabrueck.de
dbuser=puppetmaster
dbpassword=Vb6mZztp6uLMQHfa
[master]
ssl_client_header = SSL_CLIENT_S_DN
ssl_client_verify_header = SSL_CLIENT_VERIFY
#catalog_format=marshal
#reports=store,http
# store only to dashboard
reports=http
#reporturl=http://localhost/reports/upload
reporturl="http://ikw.uni-osnabrueck.de/puppet-dashboard/reports/upload"
# this is broken. why? <% scope.lookupvar("puppetdashboard_reporturl") -%>
#graph=true
#rrdgraph=false
modulepath=/etc/puppet/modules:/etc/puppet/modules-public:/etc/puppet/modules-common:/etc/puppet/modules-external
async_storeconfigs=true
#storeconfigs=true
rails_loglevel=info
dbconnections=20
<% end -%>
[agent]
# Make sure all log messages are sent to the right directory
# This directory must be writable by the puppet user
runinterval=1800
splay=true
report=true
server=<%= scope.lookupvar("puppetmaster_server") %>
configtimeout=920

View File

@@ -1,67 +0,0 @@
#!/usr/bin/env bash
# $Id$
# a wrapper script, to run puppetd after a random time
# this will be called by cron at the same time on each client,
# but should not call the master at the same time as the others.
<% if norunifloggedin == true -%>
# not running if users are logged in
[[ $(who|wc -l) -gt 0 ]] && exit 0
<% end -%>
export FACTERLIB="<%= scope.lookupvar("factpath") %>"
PATH="/opt/local/bin:/opt/local/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
PUPPET=$(which puppetd)
[[ -e ${PUPPET} ]] || exit 1
ISUNIIP=$(ifconfig |grep -c -e "131\.173\.3[2345]")
PIDF="/tmp/puppetd_run.pid"
function cleanup {
[[ -e ${PIDF} ]] && rm -f ${PIDF}
exit 0
}
if [ -e ${PIDF} ]; then
PID=`cat ${PIDF}`
if [ $(ps -eo pid |grep -c ${PID}) -gt 1 ]; then
exit 0
fi
fi
# write our pid
echo -n $$ >${PIDF}
if [ ${ISUNIIP} -gt 0 ]; then
if [ -e ${PUPPET} ]; then
#mac os X laptop check
if [ -e /usr/bin/pmset ]; then
if [ $(/usr/bin/pmset -g batt | grep -c "Battery Power") -eq 1 ]; then
#we are running on battery and do not want to do anything
cleanup
fi
fi
#Linux laptop check
if [ -e /proc/acpi/ac_adapter/AC/state ]; then
if [ $(grep -c "on-line" /proc/acpi/ac_adapter/AC/state) -eq 0 ]; then
#we are running on battery and do not want to do anything
cleanup
fi
fi
MAXSLEEP=<%= maxsleep %> #How many seconds to wait maximally
SLEEP=${RANDOM}
I=${RANDOM}
# $RANDOM must be called several times, to ensure it really
# is something like random
for x in 1 2 3 4 5 6 7 8 9 10 11 12; do
SLEEP=${RANDOM}
done
# wait maximally $MAXSLEEP seconds
sleep $(expr ${SLEEP} % ${MAXSLEEP})
# run puppetd
nice -n 12 $PUPPET -t 2&>/var/log/puppet/puppetd_run.log
fi
fi
# cleanup the pidfile
cleanup