freifunk/puppet-ff_gw
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:freifunkhamburg/puppet-ff_gw

Browse source
This commit is contained in:
ohrensessel 2014-08-27 15:49:18 +02:00
parent 755fe47d3c 1d222434e8
commit e8740e0b18
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
files/root/bin/autoupdate_fastd_keys.sh
View file

@ -2,6 +2,10 @@
# Simple script to update fastd peers from git upstream # Simple script to update fastd peers from git upstream
# and only send HUP to fastd when changes happend. # and only send HUP to fastd when changes happend.
if [[ "$1" == "-v" ]]; then
VERBOSE=1
fi
# CONFIGURE THIS TO YOUR PEER DIRECTORY # CONFIGURE THIS TO YOUR PEER DIRECTORY
FASTD_PEERS=/etc/fastd/ffhh-mesh-vpn/peers FASTD_PEERS=/etc/fastd/ffhh-mesh-vpn/peers
@ -17,11 +21,11 @@ GIT_REVISION=$(getCurrentVersion)
# Automagically commit local changes # Automagically commit local changes
# This preserves local changes # This preserves local changes
git commit -m "CRON: auto commit" git commit --quiet -m "CRON: auto commit" > /dev/null
# Pull latest changes from upstream # Pull latest changes from upstream
git fetch git fetch --quiet
git merge origin/master -m "Auto Merge" git merge origin/master --quiet -m "Auto Merge"
# Get new version hash # Get new version hash
GIT_NEW_REVISION=$(getCurrentVersion) GIT_NEW_REVISION=$(getCurrentVersion)
@ -29,7 +33,7 @@ GIT_NEW_REVISION=$(getCurrentVersion)
if [ $GIT_REVISION != $GIT_NEW_REVISION ] if [ $GIT_REVISION != $GIT_NEW_REVISION ]
then then
# Version has changed we need to update # Version has changed we need to update
echo "Reload fastd peers" test -n "$VERBOSE" && echo "Reload fastd peers"
kill -HUP $(pidof fastd) kill -HUP $(pidof fastd)
fi fi

10
manifests/sysadmin.pp
View file

@ -12,12 +12,22 @@ class ff_gw::sysadmin($zabbixserver = '127.0.0.1', $muninserver = '127.0.0.1', $
# next important thing: set up apt repositories # next important thing: set up apt repositories
class { 'ff_gw::sysadmin::software': } class { 'ff_gw::sysadmin::software': }
# remove cronjob
cron { cron {
'ntpdate-debian': 'ntpdate-debian':
ensure => absent,
command => '/usr/sbin/ntpdate-debian', command => '/usr/sbin/ntpdate-debian',
user => root, user => root,
minute => '0'; minute => '0';
} }
# replace with a real NTP daemon
package { 'ntp':
ensure => present,
}
~>
service { 'ntp':
ensure => true,
}
# user accounts # user accounts
create_resources('account', $accounts) create_resources('account', $accounts)