tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lynx: Fix package named and local config location for Ubuntu 16.04.

Browse source
This commit is contained in:
Timo Makinen 2017-02-01 14:40:02 +02:00
parent 788d6b4c22
commit a3bf8bcea6
1 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
lynx/manifests/init.pp
View file

@ -11,32 +11,46 @@ class lynx {
$www_default_url = "http://www.${::domain}" $www_default_url = "http://www.${::domain}"
} }
if $::operatingsystem != "OpenBSD" { case $::operatingsystem {
package { "lynx": "openbsd": {
ensure => installed, exec { "add-local-lynx-config":
name => $::operatingsystem ? { command => "echo 'INCLUDE:/etc/lynx-site.cfg' >> /etc/lynx.cfg",
"ubuntu" => "lynx-cur", path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
default => "lynx", user => "root",
}, unless => "fgrep 'INCLUDE:/etc/lynx-site.cfg' /etc/lynx.cfg",
before => File["/usr/local/bin/html2text"], }
$config = "/etc/lynx-site.cfg"
$package = undef
}
"ubuntu": {
if versioncmp($::operatingsystemrelease, "16.04") < 0 {
$config = "/etc/lynx-cur/local.cfg"
$package = "lynx-cur"
} else {
$config = "/etc/lynx/local.cfg"
$package = "lynx"
}
}
default: {
$config = "/etc/lynx-site.cfg"
$package = "lynx"
} }
} }
if $::operatingsystem == "OpenBSD" { if $package {
exec { "add-local-lynx-config": package { "lynx":
command => "echo 'INCLUDE:/etc/lynx-site.cfg' >> /etc/lynx.cfg", ensure => installed,
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin", name => $package,
user => root, before => [
unless => "fgrep 'INCLUDE:/etc/lynx-site.cfg' /etc/lynx.cfg", File["/usr/local/bin/html2text"],
File["lynx-site.cfg"],
],
} }
} }
file { "lynx-site.cfg": file { "lynx-site.cfg":
ensure => present, ensure => present,
name => $::operatingsystem ? { name => $config,
"ubuntu" => "/etc/lynx-cur/local.cfg",
default => "/etc/lynx-site.cfg",
},
content => template("lynx/lynx-site.cfg.erb"), content => template("lynx/lynx-site.cfg.erb"),
mode => "0644", mode => "0644",
owner => "root", owner => "root",
@ -44,10 +58,6 @@ class lynx {
"openbsd" => "wheel", "openbsd" => "wheel",
default => "root", default => "root",
}, },
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["lynx"],
},
} }
file { "/usr/local/bin/html2text": file { "/usr/local/bin/html2text":