File tree 3 files changed +7
-15
lines changed
3 files changed +7
-15
lines changed Original file line number Diff line number Diff line change @@ -72,9 +72,6 @@ mod 'puppetlabs/rabbitmq',
72
72
mod 'puphpet/redis' ,
73
73
:git => 'https://github.com/puphpet/puppet-redis.git' ,
74
74
:ref => 'd9b3b23b0c'
75
- mod 'puppet/resolvconf' ,
76
- :git => 'https://github.com/thias/puppet-resolvconf.git' ,
77
- :ref => '5bf752b84b'
78
75
mod 'maestrodev/rvm'
79
76
mod 'example42/solr' ,
80
77
:git => 'https://github.com/example42/puppet-solr.git' ,
Original file line number Diff line number Diff line change 178
178
179
179
create_resources(' class' , { ' locales' => $locales_settings_merged })
180
180
}
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
- }
Original file line number Diff line number Diff line change @@ -50,6 +50,13 @@ if [[ ! -f '/.puphpet-stuff/iptables-persistent-installed' ]] && [ "${OS}" == 'd
50
50
touch ' /.puphpet-stuff/iptables-persistent-installed'
51
51
fi
52
52
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
+
53
60
if [[ -f ' /.puphpet-stuff/initial-setup-base-packages' ]]; then
54
61
exit 0
55
62
fi
You can’t perform that action at this time.
0 commit comments