Skip to content

Commit bdc979c

Browse files
committed
Moves nameserver change to bash scripts; fixes puphpet#1612
1 parent d138885 commit bdc979c

File tree

3 files changed

+7
-15
lines changed

3 files changed

+7
-15
lines changed

archive/puphpet/puppet/Puppetfile

-3
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ mod 'puppetlabs/rabbitmq',
7272
mod 'puphpet/redis',
7373
:git => 'https://github.com/puphpet/puppet-redis.git',
7474
:ref => 'd9b3b23b0c'
75-
mod 'puppet/resolvconf',
76-
:git => 'https://github.com/thias/puppet-resolvconf.git',
77-
:ref => '5bf752b84b'
7875
mod 'maestrodev/rvm'
7976
mod 'example42/solr',
8077
:git => 'https://github.com/example42/puppet-solr.git',

archive/puphpet/puppet/nodes/Server.pp

-12
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,3 @@
178178

179179
create_resources('class', { 'locales' => $locales_settings_merged })
180180
}
181-
182-
# Set to Google's DNS
183-
if $::operatingsystem == 'ubuntu' {
184-
$resolve_conf_file = '/run/resolvconf/resolv.conf'
185-
} else {
186-
$resolve_conf_file = '/etc/resolv.conf'
187-
}
188-
189-
resolvconf::file { $resolve_conf_file:
190-
header => 'This file is managed by Puppet, do not edit',
191-
nameserver => [ '8.8.8.8', '8.8.4.4' ],
192-
}

archive/puphpet/shell/initial-setup.sh

+7
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@ if [[ ! -f '/.puphpet-stuff/iptables-persistent-installed' ]] && [ "${OS}" == 'd
5050
touch '/.puphpet-stuff/iptables-persistent-installed'
5151
fi
5252

53+
if [[ ! -f '/.puphpet-stuff/resolv-conf-changed' ]]; then
54+
echo "nameserver 8.8.8.8" > /etc/resolv.conf
55+
echo "nameserver 8.8.4.4" >> /etc/resolv.conf
56+
57+
touch '/.puphpet-stuff/resolv-conf-changed'
58+
fi
59+
5360
if [[ -f '/.puphpet-stuff/initial-setup-base-packages' ]]; then
5461
exit 0
5562
fi

0 commit comments

Comments
 (0)