other/Puppet: manifests/templates.pp annotate

annotate manifests/templates.pp @ 446:ba3c446d5a47

Update config to support Ubuntu Also fixed a CSP heading that seemed to be a problem on the VM

author	IBBoard <dev@ibboard.co.uk>
date	Mon, 08 May 2023 13:47:39 +0100
parents	e4de05e3a2f8
children	1a9de0661666

rev	line source
32 6bbc86f6cee5 Tidy up ordering and dependencies (including making sure we have a necessary file for Fail2Ban to start) IBBoard <dev@ibboard.co.uk> parents: 25 diff changeset	1 # Make sure packages come after their repos
382 308b4149bee5 Add anchors to simplify dependencies IBBoard <dev@ibboard.co.uk> parents: 379 diff changeset	2 File<\| tag == 'repo-config' \|>
308b4149bee5 Add anchors to simplify dependencies IBBoard <dev@ibboard.co.uk> parents: 379 diff changeset	3 -> anchor { 'Repo-config': }
308b4149bee5 Add anchors to simplify dependencies IBBoard <dev@ibboard.co.uk> parents: 379 diff changeset	4 -> YumRepo<\| \|>
446 ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	5 -> Apt::Source<\| \|>
382 308b4149bee5 Add anchors to simplify dependencies IBBoard <dev@ibboard.co.uk> parents: 379 diff changeset	6 -> anchor { 'Repos': }
308b4149bee5 Add anchors to simplify dependencies IBBoard <dev@ibboard.co.uk> parents: 379 diff changeset	7 -> Package<\| \|>
32 6bbc86f6cee5 Tidy up ordering and dependencies (including making sure we have a necessary file for Fail2Ban to start) IBBoard <dev@ibboard.co.uk> parents: 25 diff changeset	8
6bbc86f6cee5 Tidy up ordering and dependencies (including making sure we have a necessary file for Fail2Ban to start) IBBoard <dev@ibboard.co.uk> parents: 25 diff changeset	9 # Make sure all files are in place before starting services
298 61e90445c899 Merge CentOS8 and CentOS7 branches IBBoard <dev@ibboard.co.uk> parents: 292 284 diff changeset	10 # FIXME: Title matches are to fix a dependency cycle
382 308b4149bee5 Add anchors to simplify dependencies IBBoard <dev@ibboard.co.uk> parents: 379 diff changeset	11 File<\| tag != 'post-service' and title != '/etc/sysconfig/ip6tables' and title != '/etc/sysconfig/iptables' \|>
308b4149bee5 Add anchors to simplify dependencies IBBoard <dev@ibboard.co.uk> parents: 379 diff changeset	12 -> anchor { 'Pre-Service Files': }
308b4149bee5 Add anchors to simplify dependencies IBBoard <dev@ibboard.co.uk> parents: 379 diff changeset	13 -> Service<\| \|>
246 c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	14
c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	15 # Set some shortcut variables
c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	16 #$os = $operatingsystem
249 e9323ff8f451 Make EPEL work on multiple versions of CentOS IBBoard <dev@ibboard.co.uk> parents: 247 diff changeset	17 $osver = $operatingsystemmajrelease
246 c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	18 $server = ''
32 6bbc86f6cee5 Tidy up ordering and dependencies (including making sure we have a necessary file for Fail2Ban to start) IBBoard <dev@ibboard.co.uk> parents: 25 diff changeset	19
6bbc86f6cee5 Tidy up ordering and dependencies (including making sure we have a necessary file for Fail2Ban to start) IBBoard <dev@ibboard.co.uk> parents: 25 diff changeset	20
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	21 class basenode {
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	22 include sudo
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	23
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	24 include defaultusers
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	25 include logwatch
24 204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings) IBBoard <dev@ibboard.co.uk> parents: 18 diff changeset	26
204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings) IBBoard <dev@ibboard.co.uk> parents: 18 diff changeset	27 file { '/etc/puppet/hiera.yaml':
204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings) IBBoard <dev@ibboard.co.uk> parents: 18 diff changeset	28 ensure => present,
264 ea72ea1f7320 Update Hiera to fix warnings IBBoard <dev@ibboard.co.uk> parents: 262 diff changeset	29 content => "
ea72ea1f7320 Update Hiera to fix warnings IBBoard <dev@ibboard.co.uk> parents: 262 diff changeset	30 # Let the system set defaults
ea72ea1f7320 Update Hiera to fix warnings IBBoard <dev@ibboard.co.uk> parents: 262 diff changeset	31 version: 5
ea72ea1f7320 Update Hiera to fix warnings IBBoard <dev@ibboard.co.uk> parents: 262 diff changeset	32 ",
24 204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings) IBBoard <dev@ibboard.co.uk> parents: 18 diff changeset	33 }
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	34
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	35 if $operatingsystem == 'Ubuntu' {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	36 file { '/etc/locale.gen':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	37 ensure => present,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	38 content => "en_GB.UTF-8 UTF-8",
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	39 notify => Exec['Regen locales']
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	40 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	41 exec { 'Regen locales':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	42 command => 'locale-gen',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	43 refreshonly => true
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	44 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	45 # Don't waste space with Snap and do everything properly with system packages
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	46 [ 'lxd', 'core18', 'core20', 'snapd'].each \|$snap\| {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	47 exec { "remove $snap snap package":
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	48 command => "snap remove $snap",
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	49 onlyif => "which snap && snap list $snap",
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	50 tag => 'snap',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	51 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	52 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	53 Exec<\| tag == 'snap' \|> ->
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	54 package { 'snapd':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	55 ensure => purged,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	56 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	57 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	58 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	59
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	60 class basevpsnode (
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	61 $primary_ip,
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	62 $proxy_4to6_ip_prefix = undef,
279 e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	63 $proxy_upstream = undef,
326 63e0b5149cfb Add fallback relays to Postfix IBBoard <dev@ibboard.co.uk> parents: 323 diff changeset	64 $nat64_ranges = [],
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	65 $mailserver,
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	66 $imapserver,
326 63e0b5149cfb Add fallback relays to Postfix IBBoard <dev@ibboard.co.uk> parents: 323 diff changeset	67 $mailrelays = [],
35 1bb941522ebf Handle differences in firewalling between ASO (using APF) and most other hosts (using iptables) IBBoard <dev@ibboard.co.uk> parents: 32 diff changeset	68 $firewall_cmd = 'iptables',
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	69 ) {
44 546dfa011f58 Remove "puppet" host name because we don't need it IBBoard <dev@ibboard.co.uk> parents: 18 diff changeset	70
40 222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	71 if $firewall_cmd == 'iptables' {
279 e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	72 class { 'vpsfirewall':
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	73 fw_protocol => $primary_ip =~ Stdlib::IP::Address::V6 ? { true => 'IPv6', default => 'IPv4'},
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	74 }
40 222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	75 }
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	76
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	77 #VPS is a self-mastered Puppet machine, so bodge a Hosts file
302 01d1b0f6dbaf Fix more IPv4 vs IPv6 settings IBBoard <dev@ibboard.co.uk> parents: 301 diff changeset	78 if $primary_ip =~ Stdlib::IP::Address::V6 {
01d1b0f6dbaf Fix more IPv4 vs IPv6 settings IBBoard <dev@ibboard.co.uk> parents: 301 diff changeset	79 $lo_ip = '::1'
01d1b0f6dbaf Fix more IPv4 vs IPv6 settings IBBoard <dev@ibboard.co.uk> parents: 301 diff changeset	80 } else {
01d1b0f6dbaf Fix more IPv4 vs IPv6 settings IBBoard <dev@ibboard.co.uk> parents: 301 diff changeset	81 $lo_ip = '127.0.0.1'
01d1b0f6dbaf Fix more IPv4 vs IPv6 settings IBBoard <dev@ibboard.co.uk> parents: 301 diff changeset	82 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	83 file { '/etc/hosts':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	84 ensure => present,
302 01d1b0f6dbaf Fix more IPv4 vs IPv6 settings IBBoard <dev@ibboard.co.uk> parents: 301 diff changeset	85 content => "${lo_ip} localhost\n${primary_ip} ${fqdn}",
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	86 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	87
313 49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	88 if $proxy_4to6_ip_prefix != undef {
49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	89 # …:1 to …:9 for websites, …:10 for mail
49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	90 $ipv6_addresses = Integer[1, 10].map \|$octet\| { "$proxy_4to6_ip_prefix:$octet" }
49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	91
49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	92 $ipv6_secondaries = join($ipv6_addresses, " ")
49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	93
49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	94 augeas {'IPv6 secondary addresses':
49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	95 context => "/files/etc/sysconfig/network-scripts/ifcfg-eth0",
49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	96 changes => "set IPV6ADDR_SECONDARIES '\"$ipv6_secondaries\"'",
49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	97 }
49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	98 }
49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	99
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	100 require repos
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	101 include basenode
246 c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	102 include privat
100 fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	103 include dnsresolver
396 e93588ec1ce3 Use "param" variables for settings instead of conditions IBBoard <dev@ibboard.co.uk> parents: 393 diff changeset	104 include ::privat::params
e93588ec1ce3 Use "param" variables for settings instead of conditions IBBoard <dev@ibboard.co.uk> parents: 393 diff changeset	105 class { '::ssh':
e93588ec1ce3 Use "param" variables for settings instead of conditions IBBoard <dev@ibboard.co.uk> parents: 393 diff changeset	106 sshd_config_port => $::privat::params::ssh_port[$::fqdn]
e93588ec1ce3 Use "param" variables for settings instead of conditions IBBoard <dev@ibboard.co.uk> parents: 393 diff changeset	107 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	108 include vcs::server
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	109 include vcs::client
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	110 class { 'webserver':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	111 primary_ip => $primary_ip,
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	112 proxy_4to6_ip_prefix => $proxy_4to6_ip_prefix,
313 49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	113 proxy_4to6_mask => 124,
279 e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	114 proxy_upstream => $proxy_upstream,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	115 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	116 include cronjobs
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	117 include logrotate
35 1bb941522ebf Handle differences in firewalling between ASO (using APF) and most other hosts (using iptables) IBBoard <dev@ibboard.co.uk> parents: 32 diff changeset	118 class { 'fail2ban':
1bb941522ebf Handle differences in firewalling between ASO (using APF) and most other hosts (using iptables) IBBoard <dev@ibboard.co.uk> parents: 32 diff changeset	119 firewall_cmd => $firewall_cmd,
1bb941522ebf Handle differences in firewalling between ASO (using APF) and most other hosts (using iptables) IBBoard <dev@ibboard.co.uk> parents: 32 diff changeset	120 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	121 include tools
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	122 class { 'email':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	123 mailserver => $mailserver,
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	124 imapserver => $imapserver,
311 51d3748f8112 Configure Dovecot (IMAP) for PROXY protocol use IBBoard <dev@ibboard.co.uk> parents: 310 diff changeset	125 mailserver_ip => $primary_ip,
313 49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	126 proxy_ip => $proxy_4to6_ip_prefix != undef ? { true => "${proxy_4to6_ip_prefix}:10", default => undef },
311 51d3748f8112 Configure Dovecot (IMAP) for PROXY protocol use IBBoard <dev@ibboard.co.uk> parents: 310 diff changeset	127 proxy_upstream => $proxy_upstream,
326 63e0b5149cfb Add fallback relays to Postfix IBBoard <dev@ibboard.co.uk> parents: 323 diff changeset	128 nat64_ranges => $nat64_ranges,
63e0b5149cfb Add fallback relays to Postfix IBBoard <dev@ibboard.co.uk> parents: 323 diff changeset	129 mailrelays => $mailrelays,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	130 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	131 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	132
100 fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	133 ## Classes to allow facet behaviour using preconfigured setups of classes
fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	134
279 e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	135 class vpsfirewall ($fw_protocol) {
40 222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	136 resources { "firewall":
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	137 purge => false,
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	138 }
279 e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	139 class { "my_fw":
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	140 ip_version => $fw_protocol,
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	141 }
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	142 # Control what does and doesn't get pruned in the main filter chain
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	143 firewallchain { "INPUT:filter:$fw_protocol":
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	144 purge => true,
40 222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	145 ignore => [
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	146 '-j f2b-[^ ]+$',
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	147 '^(:\|-A )f2b-',
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	148 '--comment "Great Firewall of China"',
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	149 '--comment "Do not purge',
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	150 ],
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	151 }
279 e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	152 if ($fw_protocol != "IPv6") {
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	153 firewall { '010 Whitelist Googlebot':
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	154 source => '66.249.64.0/19',
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	155 dport => [80,443],
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	156 proto => tcp,
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	157 action => accept,
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	158 }
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	159 # Block a spammer hitting our contact forms (also on StopForumSpam list A LOT)
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	160 firewall { '099 Blacklist spammers 1':
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	161 source => '107.181.78.172',
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	162 dport => [80, 443],
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	163 proto => tcp,
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	164 action => 'reject',
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	165 }
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	166 firewall { '099 Blacklist IODC bot':
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	167 # IODC bot makes too many bad requests, and contact form is broken
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	168 # They don't publish a robots.txt name, so firewall it!
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	169 source => '86.153.145.149',
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	170 dport => [ 80, 443 ],
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	171 proto => tcp,
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	172 action => 'reject',
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	173 }
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	174 firewall { '099 Blacklist Baidu Brazil':
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	175 #Baidu got a Brazilian netblock and are hitting us hard
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	176 #Baidu doesn't honour "crawl-delay" in robots.txt
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	177 #Baidu gets firewalled
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	178 source => '131.161.8.0/22',
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	179 dport => [ 80, 443 ],
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	180 proto => tcp,
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	181 action => 'reject',
e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	182 }
139 abaf384dc939 Block another annoying IP with a firewall rule IBBoard <dev@ibboard.co.uk> parents: 137 diff changeset	183 }
279 e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	184 firewallchain { "GREATFIREWALLOFCHINA:filter:$fw_protocol":
40 222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	185 ensure => present,
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	186 }
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	187 firewall { '050 Check our Great Firewall Against China':
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	188 chain => 'INPUT',
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	189 jump => 'GREATFIREWALLOFCHINA',
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	190 }
279 e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	191 firewallchain { "Fail2Ban:filter:$fw_protocol":
64 3bb824dabaae Make sure Fail2Ban rules are in right order (using separate chain) and whitelist Googlebot (which keeps hitting Script Kiddy targets for unknown reasons) IBBoard <dev@ibboard.co.uk> parents: 61 diff changeset	192 ensure => present,
3bb824dabaae Make sure Fail2Ban rules are in right order (using separate chain) and whitelist Googlebot (which keeps hitting Script Kiddy targets for unknown reasons) IBBoard <dev@ibboard.co.uk> parents: 61 diff changeset	193 }
3bb824dabaae Make sure Fail2Ban rules are in right order (using separate chain) and whitelist Googlebot (which keeps hitting Script Kiddy targets for unknown reasons) IBBoard <dev@ibboard.co.uk> parents: 61 diff changeset	194 firewall { '060 Check Fail2Ban':
3bb824dabaae Make sure Fail2Ban rules are in right order (using separate chain) and whitelist Googlebot (which keeps hitting Script Kiddy targets for unknown reasons) IBBoard <dev@ibboard.co.uk> parents: 61 diff changeset	195 chain => 'INPUT',
3bb824dabaae Make sure Fail2Ban rules are in right order (using separate chain) and whitelist Googlebot (which keeps hitting Script Kiddy targets for unknown reasons) IBBoard <dev@ibboard.co.uk> parents: 61 diff changeset	196 jump => 'Fail2Ban',
3bb824dabaae Make sure Fail2Ban rules are in right order (using separate chain) and whitelist Googlebot (which keeps hitting Script Kiddy targets for unknown reasons) IBBoard <dev@ibboard.co.uk> parents: 61 diff changeset	197 }
40 222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	198 }
222904296578 Add firewall handling when we run without APF IBBoard <dev@ibboard.co.uk> parents: 38 diff changeset	199
100 fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	200 class dnsresolver {
290 1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	201 package { 'unbound':
100 fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	202 ensure => present,
fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	203 }
290 1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	204 package { 'named':
1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	205 ensure => absent,
1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	206 }
100 fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	207
fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	208 service { 'named':
290 1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	209 ensure => stopped,
1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	210 enable => false,
1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	211 }
1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	212 service { 'unbound':
100 fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	213 ensure => running,
fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	214 enable => true,
194 a08de3153548 Add a named.conf file to control cache/memory size IBBoard <dev@ibboard.co.uk> parents: 193 diff changeset	215 }
a08de3153548 Add a named.conf file to control cache/memory size IBBoard <dev@ibboard.co.uk> parents: 193 diff changeset	216
a08de3153548 Add a named.conf file to control cache/memory size IBBoard <dev@ibboard.co.uk> parents: 193 diff changeset	217 file { '/etc/named.conf':
290 1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	218 ensure => absent,
1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	219 }
1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	220 file { '/etc/unbound/unbound.conf':
194 a08de3153548 Add a named.conf file to control cache/memory size IBBoard <dev@ibboard.co.uk> parents: 193 diff changeset	221 ensure => present,
247 308f69ca988c Add config for new server IBBoard <dev@ibboard.co.uk> parents: 246 diff changeset	222 source => [
290 1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	223 "puppet:///common/unbound.conf-${::hostname}",
1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	224 "puppet:///common/unbound.conf",
247 308f69ca988c Add config for new server IBBoard <dev@ibboard.co.uk> parents: 246 diff changeset	225 ],
290 1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	226 require => Package['unbound'],
1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	227 notify => Service['unbound'],
100 fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	228 }
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	229 file { '/etc/NetworkManager/conf.d':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	230 ensure => directory
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	231 }
100 fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	232 file { '/etc/NetworkManager/conf.d/local-dns-resolver.conf':
fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	233 ensure => present,
fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	234 content => "[main]
fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	235 dns=none",
fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	236 }
fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	237
101 a48b6011a084 Stop Bind trying IPv6, as we only have a link-local IP IBBoard <dev@ibboard.co.uk> parents: 100 diff changeset	238 file { '/etc/sysconfig/named':
290 1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	239 ensure => absent,
101 a48b6011a084 Stop Bind trying IPv6, as we only have a link-local IP IBBoard <dev@ibboard.co.uk> parents: 100 diff changeset	240 }
100 fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	241 file { '/etc/resolv.conf':
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	242 ensure => file,
301 1bfc290270cc Fix sa-update by using IPv6 for local DNS cache IBBoard <dev@ibboard.co.uk> parents: 298 diff changeset	243 # "ipaddress" key only exists for machines with IPv4 addresses
1bfc290270cc Fix sa-update by using IPv6 for local DNS cache IBBoard <dev@ibboard.co.uk> parents: 298 diff changeset	244 content => has_key($facts, 'ipaddress') ? { true => "nameserver 127.0.0.1", default => "nameserver ::1" },
290 1182a180085d Swap from Bind to Named for light-weight DNS IBBoard <dev@ibboard.co.uk> parents: 268 diff changeset	245 require => Service['unbound'],
246 c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	246 tag => 'post-service',
100 fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	247 }
fd3446c3b7b9 Set up a recursive localhost-only Bind server (assuming RH's safe and sane default configs) IBBoard <dev@ibboard.co.uk> parents: 99 diff changeset	248 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	249
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	250 class repos {
439 e4de05e3a2f8 Ensure Python params are included IBBoard <dev@ibboard.co.uk> parents: 435 diff changeset	251 include ::python::params
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	252 if $operatingsystem == 'CentOS' {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	253 yumrepo { 'epel':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	254 mirrorlist => 'https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	255 descr => "Extra Packages for Enterprise Linux",
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	256 enabled => 1,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	257 failovermethod => absent,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	258 gpgcheck => 1,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	259 gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$osver",
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	260 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	261 file { "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$osver":
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	262 ensure => present,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	263 source => "puppet:///common/RPM-GPG-KEY-EPEL-$osver",
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	264 tag => 'repo-config',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	265 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	266 yumrepo { 'ibboard':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	267 baseurl => 'https://download.opensuse.org/repositories/home:/IBBoard:/server/CentOS_$releasever/',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	268 descr => 'Extra packages from IBBoard',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	269 enabled => 1,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	270 gpgcheck => 1,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	271 gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ibboard',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	272 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	273 file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-ibboard':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	274 ensure => present,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	275 source => 'puppet:///common/RPM-GPG-KEY-ibboard',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	276 tag => 'repo-config',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	277 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	278 yumrepo { 'webtatic':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	279 ensure => absent,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	280 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	281 file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-webtatic-andy':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	282 ensure => absent,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	283 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	284 file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-webtatic-el7':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	285 ensure => absent,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	286 }
409 621e78abf82c Fix `requires devel` problem with CentOS IBBoard <dev@ibboard.co.uk> parents: 408 diff changeset	287 # Python requires the `devel` package on CentOS, but by default the module tries to uninstall it
621e78abf82c Fix `requires devel` problem with CentOS IBBoard <dev@ibboard.co.uk> parents: 408 diff changeset	288 $dev = 'present'
621e78abf82c Fix `requires devel` problem with CentOS IBBoard <dev@ibboard.co.uk> parents: 408 diff changeset	289 }
621e78abf82c Fix `requires devel` problem with CentOS IBBoard <dev@ibboard.co.uk> parents: 408 diff changeset	290 else {
621e78abf82c Fix `requires devel` problem with CentOS IBBoard <dev@ibboard.co.uk> parents: 408 diff changeset	291 # Other distros can take the default devel status
621e78abf82c Fix `requires devel` problem with CentOS IBBoard <dev@ibboard.co.uk> parents: 408 diff changeset	292 $dev = $::python::params::dev
446 ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	293
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	294 apt::source {
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	295 'ibboard':
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	296 location => 'http://download.opensuse.org/repositories/home:/IBBoard:/server/xUbuntu_22.04/',
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	297 release => '/',
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	298 repos => '',
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	299 key => {
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	300 id => 'EDC682701D792970AD8645E7A7A55B845DCFCBE2',
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	301 source => "https://download.opensuse.org/repositories/home:IBBoard:server/xUbuntu_22.04/Release.key"
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	302 }
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	303 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	304 }
148 d9fcabc75a1e Fix pip installations IBBoard <dev@ibboard.co.uk> parents: 147 diff changeset	305
272 c42fb28cff86 Update to a newer Python module IBBoard <dev@ibboard.co.uk> parents: 271 diff changeset	306 if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '8') >= 0 {
383 f9a6f6ff8256 Attempt to migrate CentOS8 to Streams automatically IBBoard <dev@ibboard.co.uk> parents: 382 diff changeset	307 # The following may possibly work to ensure a CentOS Streams install.
f9a6f6ff8256 Attempt to migrate CentOS8 to Streams automatically IBBoard <dev@ibboard.co.uk> parents: 382 diff changeset	308 # Or it might fail for inexplicable reasons.
f9a6f6ff8256 Attempt to migrate CentOS8 to Streams automatically IBBoard <dev@ibboard.co.uk> parents: 382 diff changeset	309 # FIXME: Should be "centos-release-stream" to migrate (provides repos), but then that gets replaced by centos-stream-release,
f9a6f6ff8256 Attempt to migrate CentOS8 to Streams automatically IBBoard <dev@ibboard.co.uk> parents: 382 diff changeset	310 # which Puppet doesn't recognise as the same and so keeps trying to re-install. May need an "unless" or maybe "allow_virtual"
f9a6f6ff8256 Attempt to migrate CentOS8 to Streams automatically IBBoard <dev@ibboard.co.uk> parents: 382 diff changeset	311 package { 'centos-stream-release':
f9a6f6ff8256 Attempt to migrate CentOS8 to Streams automatically IBBoard <dev@ibboard.co.uk> parents: 382 diff changeset	312 ensure => installed,
f9a6f6ff8256 Attempt to migrate CentOS8 to Streams automatically IBBoard <dev@ibboard.co.uk> parents: 382 diff changeset	313 notify => Exec['migrate to streams'];
f9a6f6ff8256 Attempt to migrate CentOS8 to Streams automatically IBBoard <dev@ibboard.co.uk> parents: 382 diff changeset	314 }
f9a6f6ff8256 Attempt to migrate CentOS8 to Streams automatically IBBoard <dev@ibboard.co.uk> parents: 382 diff changeset	315 exec { 'migrate to streams':
f9a6f6ff8256 Attempt to migrate CentOS8 to Streams automatically IBBoard <dev@ibboard.co.uk> parents: 382 diff changeset	316 command => '/usr/bin/dnf swap centos-linux-repos centos-stream-repos; /usr/bin/dnf distro-sync -y',
f9a6f6ff8256 Attempt to migrate CentOS8 to Streams automatically IBBoard <dev@ibboard.co.uk> parents: 382 diff changeset	317 refreshonly => true
f9a6f6ff8256 Attempt to migrate CentOS8 to Streams automatically IBBoard <dev@ibboard.co.uk> parents: 382 diff changeset	318 }
148 d9fcabc75a1e Fix pip installations IBBoard <dev@ibboard.co.uk> parents: 147 diff changeset	319 }
272 c42fb28cff86 Update to a newer Python module IBBoard <dev@ibboard.co.uk> parents: 271 diff changeset	320
c42fb28cff86 Update to a newer Python module IBBoard <dev@ibboard.co.uk> parents: 271 diff changeset	321 class { 'python':
c42fb28cff86 Update to a newer Python module IBBoard <dev@ibboard.co.uk> parents: 271 diff changeset	322 ensure => 'present',
401 f0ee7a16125d Switch to Python 3 on all platforms IBBoard <dev@ibboard.co.uk> parents: 399 diff changeset	323 version => 'python3',
272 c42fb28cff86 Update to a newer Python module IBBoard <dev@ibboard.co.uk> parents: 271 diff changeset	324 pip => 'present',
c42fb28cff86 Update to a newer Python module IBBoard <dev@ibboard.co.uk> parents: 271 diff changeset	325 use_epel => false,
409 621e78abf82c Fix `requires devel` problem with CentOS IBBoard <dev@ibboard.co.uk> parents: 408 diff changeset	326 dev => $dev,
272 c42fb28cff86 Update to a newer Python module IBBoard <dev@ibboard.co.uk> parents: 271 diff changeset	327 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	328 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	329
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	330 class tools {
446 ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	331 $packages = [ 'sqlite', 'bash-completion', 'nano', 'zip', 'bzip2', 'mlocate', 'patch', 'tmux', 'wget', 'rsync' ]
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	332 package { $packages:
131 0dd899a10ee1 Change all "latest" packages to "installed" IBBoard <dev@ibboard.co.uk> parents: 129 diff changeset	333 ensure => installed;
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	334 }
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	335 if $osfamily == 'RedHat' {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	336 package { 'yum-utils':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	337 ensure => installed
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	338 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	339 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	340 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	341
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	342 class logrotate {
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	343 package { 'logrotate':
131 0dd899a10ee1 Change all "latest" packages to "installed" IBBoard <dev@ibboard.co.uk> parents: 129 diff changeset	344 ensure => installed;
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	345 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	346 file { '/etc/logrotate.d/httpd':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	347 ensure => present,
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	348 source => 'puppet:///common/logrotate-httpd',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	349 require => Package['logrotate'],
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	350 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	351 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	352
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	353 class logwatch {
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	354 package { 'logwatch':
131 0dd899a10ee1 Change all "latest" packages to "installed" IBBoard <dev@ibboard.co.uk> parents: 129 diff changeset	355 ensure => installed;
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	356 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	357 File {
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	358 ensure => present,
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	359 require => Package['logwatch'],
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	360 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	361 file { '/etc/cron.daily/0logwatch':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	362 source => 'puppet:///common/0logwatch';
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	363 }
332 7198cc4397d8 Remove custom LogWatch scripts IBBoard <dev@ibboard.co.uk> parents: 331 diff changeset	364 $logwatch_dirs = [
7198cc4397d8 Remove custom LogWatch scripts IBBoard <dev@ibboard.co.uk> parents: 331 diff changeset	365 '/etc/logwatch/',
7198cc4397d8 Remove custom LogWatch scripts IBBoard <dev@ibboard.co.uk> parents: 331 diff changeset	366 '/etc/logwatch/conf/',
7198cc4397d8 Remove custom LogWatch scripts IBBoard <dev@ibboard.co.uk> parents: 331 diff changeset	367 '/etc/logwatch/conf/logfiles/',
7198cc4397d8 Remove custom LogWatch scripts IBBoard <dev@ibboard.co.uk> parents: 331 diff changeset	368 '/etc/logwatch/conf/services/',
345 bad68f1b6467 Add updated Dovecot script to Logwatch IBBoard <dev@ibboard.co.uk> parents: 342 diff changeset	369 '/etc/logwatch/scripts/',
bad68f1b6467 Add updated Dovecot script to Logwatch IBBoard <dev@ibboard.co.uk> parents: 342 diff changeset	370 '/etc/logwatch/scripts/services/',
332 7198cc4397d8 Remove custom LogWatch scripts IBBoard <dev@ibboard.co.uk> parents: 331 diff changeset	371 ]
7198cc4397d8 Remove custom LogWatch scripts IBBoard <dev@ibboard.co.uk> parents: 331 diff changeset	372 file { $logwatch_dirs:
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	373 ensure => directory,
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	374 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	375 file { '/etc/logwatch/conf/logwatch.conf':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	376 content => 'Detail = Med',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	377 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	378 file { '/etc/logwatch/conf/logfiles/http.conf':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	379 content => 'LogFile = apache/access_*.log',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	380 }
332 7198cc4397d8 Remove custom LogWatch scripts IBBoard <dev@ibboard.co.uk> parents: 331 diff changeset	381 file { '/etc/logwatch/conf/logfiles/http-error.conf':
7198cc4397d8 Remove custom LogWatch scripts IBBoard <dev@ibboard.co.uk> parents: 331 diff changeset	382 source => 'puppet:///common/logwatch/logfiles_http-error.conf',
126 8316d4e55e92 Fix Apache 2.4 Logwatch support IBBoard <dev@ibboard.co.uk> parents: 125 diff changeset	383 }
332 7198cc4397d8 Remove custom LogWatch scripts IBBoard <dev@ibboard.co.uk> parents: 331 diff changeset	384 file { '/etc/logwatch/conf/logfiles/mysql.conf':
7198cc4397d8 Remove custom LogWatch scripts IBBoard <dev@ibboard.co.uk> parents: 331 diff changeset	385 source => 'puppet:///common/logwatch/logfiles_mysql.conf',
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	386 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	387 file { '/etc/logwatch/conf/logfiles/php.conf':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	388 source => 'puppet:///common/logwatch/logfiles_php.conf',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	389 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	390 file { '/etc/logwatch/conf/services/php.conf':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	391 source => 'puppet:///common/logwatch/services_php.conf',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	392 }
379 63adae1a374a Fix and expand PHP logwatch config IBBoard <dev@ibboard.co.uk> parents: 378 diff changeset	393 file { '/etc/logwatch/conf/services/contact-form.conf':
63adae1a374a Fix and expand PHP logwatch config IBBoard <dev@ibboard.co.uk> parents: 378 diff changeset	394 source => 'puppet:///common/logwatch/services_contact-form.conf',
63adae1a374a Fix and expand PHP logwatch config IBBoard <dev@ibboard.co.uk> parents: 378 diff changeset	395 }
345 bad68f1b6467 Add updated Dovecot script to Logwatch IBBoard <dev@ibboard.co.uk> parents: 342 diff changeset	396 file { '/etc/logwatch/scripts/services/dovecot':
bad68f1b6467 Add updated Dovecot script to Logwatch IBBoard <dev@ibboard.co.uk> parents: 342 diff changeset	397 source => 'puppet:///common/logwatch/dovecot',
bad68f1b6467 Add updated Dovecot script to Logwatch IBBoard <dev@ibboard.co.uk> parents: 342 diff changeset	398 }
346 61be075c5a68 Ignore X-Comment "SPF whitelisted" messages in Logwatch IBBoard <dev@ibboard.co.uk> parents: 345 diff changeset	399 file { '/etc/logwatch/scripts/services/postfix':
61be075c5a68 Ignore X-Comment "SPF whitelisted" messages in Logwatch IBBoard <dev@ibboard.co.uk> parents: 345 diff changeset	400 source => 'puppet:///common/logwatch/postfix',
61be075c5a68 Ignore X-Comment "SPF whitelisted" messages in Logwatch IBBoard <dev@ibboard.co.uk> parents: 345 diff changeset	401 }
347 73d7b3ec6263 Ignore log entries from Cron tasks running in user mode IBBoard <dev@ibboard.co.uk> parents: 346 diff changeset	402 file { '/etc/logwatch/scripts/services/systemd':
73d7b3ec6263 Ignore log entries from Cron tasks running in user mode IBBoard <dev@ibboard.co.uk> parents: 346 diff changeset	403 source => 'puppet:///common/logwatch/systemd',
73d7b3ec6263 Ignore log entries from Cron tasks running in user mode IBBoard <dev@ibboard.co.uk> parents: 346 diff changeset	404 }
379 63adae1a374a Fix and expand PHP logwatch config IBBoard <dev@ibboard.co.uk> parents: 378 diff changeset	405 file { '/etc/logwatch/scripts/services/php':
63adae1a374a Fix and expand PHP logwatch config IBBoard <dev@ibboard.co.uk> parents: 378 diff changeset	406 source => 'puppet:///common/logwatch/php',
63adae1a374a Fix and expand PHP logwatch config IBBoard <dev@ibboard.co.uk> parents: 378 diff changeset	407 }
63adae1a374a Fix and expand PHP logwatch config IBBoard <dev@ibboard.co.uk> parents: 378 diff changeset	408 file { '/etc/logwatch/scripts/services/contact-form':
63adae1a374a Fix and expand PHP logwatch config IBBoard <dev@ibboard.co.uk> parents: 378 diff changeset	409 source => 'puppet:///common/logwatch/contact-form',
63adae1a374a Fix and expand PHP logwatch config IBBoard <dev@ibboard.co.uk> parents: 378 diff changeset	410 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	411 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	412
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	413 #Our web server with our configs, not just a stock one
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	414 class webserver (
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	415 $primary_ip,
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	416 $proxy_4to6_ip_prefix = undef,
313 49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	417 $proxy_4to6_mask = undef,
279 e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	418 $proxy_upstream = undef,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	419 ) {
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	420
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	421 #Setup base website parameters
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	422 class { 'website':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	423 base_dir => '/srv/sites',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	424 primary_ip => $primary_ip,
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	425 proxy_4to6_ip_prefix => $proxy_4to6_ip_prefix,
313 49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	426 proxy_4to6_mask => $proxy_4to6_mask,
279 e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	427 proxy_upstream => $proxy_upstream,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	428 default_owner => $defaultusers::default_user,
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	429 default_group => $defaultusers::default_user,
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	430 default_tld => 'co.uk',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	431 default_extra_tlds => [ 'com' ],
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	432 }
110 be2b30b17a4c Switch to PHP 7 from Webtatic IBBoard <dev@ibboard.co.uk> parents: 108 diff changeset	433
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	434 if $operatingsystem == 'CentOS' {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	435 $php_suffix = ''
419 0c627ff3a7c3 Fix PHP setup on CentOS IBBoard <dev@ibboard.co.uk> parents: 418 diff changeset	436 $variant_prefix = 'php-'
416 b185498177ef Backed out changeset 6421c6f77eb8 - Add SOAP IBBoard <dev@ibboard.co.uk> parents: 415 diff changeset	437 $extra_prefix = 'pecl-'
422 8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	438 $extra_extras = {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	439 'posix' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	440 ini_prefix => '20-',
446 ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	441 },
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	442 # Sodium has been bundled since 7.2, but CentOS packages it separately
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	443 'sodium' => {
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	444 ini_prefix => '20-',
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	445 },
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	446 # JSON is integrated into PHP 8+ and so it's only a plugin in CentOS
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	447 'json' => {
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	448 ini_prefix => '20-',
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	449 },
422 8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	450 }
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	451 if versioncmp($operatingsystemrelease, '8') >= 0 {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	452 yumrepo { 'remirepo-safe':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	453 mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/safe/$basearch/mirror',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	454 descr => "Extra CentOS packages from Remi",
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	455 enabled => 1,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	456 failovermethod => absent,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	457 gpgcheck => 1,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	458 gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	459 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	460 yumrepo { 'remirepo-php':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	461 mirrorlist => 'http://cdn.remirepo.net/enterprise/8/modular/$basearch/mirror',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	462 descr => 'Remi\'s Modular repository for Enterprise Linux 8 - $basearch',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	463 enabled => 1,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	464 failovermethod => absent,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	465 gpgcheck => 1,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	466 gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	467 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	468 file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-remi':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	469 ensure => present,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	470 source => 'puppet:///common/RPM-GPG-KEY-remi.el8',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	471 tag => 'repo-config',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	472 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	473 } else {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	474 yumrepo { 'remirepo-safe':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	475 mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/safe/mirror',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	476 descr => "Extra CentOS packages from Remi",
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	477 enabled => 1,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	478 failovermethod => absent,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	479 gpgcheck => 1,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	480 gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	481 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	482 yumrepo { 'remirepo-php':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	483 mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/php74/mirror',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	484 descr => "PHP7.4 for CentOS from Remi",
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	485 enabled => 1,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	486 failovermethod => absent,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	487 gpgcheck => 1,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	488 gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	489 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	490 file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-remi':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	491 ensure => present,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	492 source => 'puppet:///common/RPM-GPG-KEY-remi',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	493 tag => 'repo-config',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	494 }
320 99e3ca448d55 Fix Remi PHP on CentOS 8 IBBoard <dev@ibboard.co.uk> parents: 317 diff changeset	495 }
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	496 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	497 elsif $operatingsystem == 'Ubuntu' {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	498 $php_suffix = ''
416 b185498177ef Backed out changeset 6421c6f77eb8 - Add SOAP IBBoard <dev@ibboard.co.uk> parents: 415 diff changeset	499 $variant_prefix = 'php-'
b185498177ef Backed out changeset 6421c6f77eb8 - Add SOAP IBBoard <dev@ibboard.co.uk> parents: 415 diff changeset	500 $extra_prefix = ''
446 ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	501 # Work around constant re-install by enabling virtual packages
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	502 # https://github.com/voxpupuli/puppet-php/issues/387
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	503 Package {
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	504 allow_virtual => true
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	505 }
416 b185498177ef Backed out changeset 6421c6f77eb8 - Add SOAP IBBoard <dev@ibboard.co.uk> parents: 415 diff changeset	506 $extra_extras = {}
238 6467e768e353 Switch to PHP 7.4 from Remi IBBoard <dev@ibboard.co.uk> parents: 236 diff changeset	507 }
110 be2b30b17a4c Switch to PHP 7 from Webtatic IBBoard <dev@ibboard.co.uk> parents: 108 diff changeset	508
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	509 #Configure the PHP version to use
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	510 class { 'website::php':
350 85d2c0079af9 Make opcache core and add APCu for object caching IBBoard <dev@ibboard.co.uk> parents: 347 diff changeset	511 suffix => $php_suffix,
335 aa9f570d6a9c Switch to PHP 7.4 now that NextCloud has reached v18 IBBoard <dev@ibboard.co.uk> parents: 334 diff changeset	512 module => ($operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '8') >= 0) ? { true => 'remi-7.4', default => undef },
416 b185498177ef Backed out changeset 6421c6f77eb8 - Add SOAP IBBoard <dev@ibboard.co.uk> parents: 415 diff changeset	513 extras => {
422 8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	514 'bcmath' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	515 ini_prefix => '20-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	516 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	517 'curl' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	518 ini_prefix => '20-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	519 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	520 'dom' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	521 ini_prefix => '20-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	522 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	523 'enchant' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	524 ini_prefix => '20-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	525 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	526 'exif' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	527 ini_prefix => '20-',
416 b185498177ef Backed out changeset 6421c6f77eb8 - Add SOAP IBBoard <dev@ibboard.co.uk> parents: 415 diff changeset	528 },
422 8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	529 'fileinfo' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	530 ini_prefix => '20-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	531 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	532 'gmp' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	533 ini_prefix => '20-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	534 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	535 'intl' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	536 ini_prefix => '20-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	537 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	538 'mysqlnd' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	539 ini_prefix => '20-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	540 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	541 'pdo' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	542 ini_prefix => '20-',
419 0c627ff3a7c3 Fix PHP setup on CentOS IBBoard <dev@ibboard.co.uk> parents: 418 diff changeset	543 },
422 8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	544 'simplexml' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	545 ini_prefix => '20-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	546 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	547 'soap' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	548 ini_prefix => '20-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	549 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	550 'xmlwriter' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	551 ini_prefix => '20-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	552 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	553 'mysqli' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	554 ini_prefix => '30-',
416 b185498177ef Backed out changeset 6421c6f77eb8 - Add SOAP IBBoard <dev@ibboard.co.uk> parents: 415 diff changeset	555 },
422 8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	556 'pdo_mysql' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	557 ini_prefix => '30-',
446 ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	558 # Provided by the php-mysql package in CentOS and declared with "Provides"
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	559 # And Ubuntu is the same but without the "Provides"
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	560 provider => "none",
422 8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	561 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	562 'xmlreader' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	563 ini_prefix => '30-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	564 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	565 'zip' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	566 ini_prefix => '30-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	567 package_prefix => "${variant_prefix}${extra_prefix}"
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	568 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	569 'apcu' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	570 ini_prefix => '40-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	571 package_prefix => "${variant_prefix}${extra_prefix}"
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	572 },
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	573 'imagick' => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	574 ini_prefix => '40-',
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	575 package_prefix => "${variant_prefix}${extra_prefix}"
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	576 },
416 b185498177ef Backed out changeset 6421c6f77eb8 - Add SOAP IBBoard <dev@ibboard.co.uk> parents: 415 diff changeset	577 } + $extra_extras,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	578 }
24 204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings) IBBoard <dev@ibboard.co.uk> parents: 18 diff changeset	579
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	580 #Setup MySQL, using (private) templates to make sure that we set non-std passwords and a default user
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	581 if $operatingsystem == 'CentOS' {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	582 if versioncmp($operatingsystemrelease, '7') >= 0 {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	583 $mysqlpackage = 'mariadb'
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	584 $mysqlsuffix = ''
24 204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings) IBBoard <dev@ibboard.co.uk> parents: 18 diff changeset	585
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	586 # Required for SELinux rule setting/status checks
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	587 if versioncmp($operatingsystemrelease, '8') >= 0 {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	588 $semanage_package_name = 'policycoreutils-python-utils'
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	589 } else {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	590 $semanage_package_name = 'policycoreutils-python'
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	591 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	592
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	593 package { 'policycoreutils-python':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	594 name => $semanage_package_name,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	595 ensure => present,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	596 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	597
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	598 $extra_packages = [
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	599 'perl-Sys-Syslog', #Required for Perl SPF checking
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	600 ]
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	601
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	602 package { $extra_packages:
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	603 ensure => installed
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	604 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	605 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	606 else {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	607 $mysqlpackage = 'mysql'
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	608 $mysqlsuffix = '55w'
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	609 }
393 a948419a23b1 Fix MySQL package names on Ubuntu IBBoard <dev@ibboard.co.uk> parents: 390 diff changeset	610 $phpmysqlsuffix = 'nd'
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	611 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	612 elsif $operatingsystem == 'Ubuntu' {
24 204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings) IBBoard <dev@ibboard.co.uk> parents: 18 diff changeset	613 $mysqlpackage = 'mariadb'
204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings) IBBoard <dev@ibboard.co.uk> parents: 18 diff changeset	614 $mysqlsuffix = ''
393 a948419a23b1 Fix MySQL package names on Ubuntu IBBoard <dev@ibboard.co.uk> parents: 390 diff changeset	615 $phpmysqlsuffix = ''
24 204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings) IBBoard <dev@ibboard.co.uk> parents: 18 diff changeset	616 }
204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings) IBBoard <dev@ibboard.co.uk> parents: 18 diff changeset	617 else {
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	618 fail("No MySQL support for ${operatingsystem}")
24 204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings) IBBoard <dev@ibboard.co.uk> parents: 18 diff changeset	619 }
402 76d18a918e7f Switch to more parameters IBBoard <dev@ibboard.co.uk> parents: 401 diff changeset	620 include ::defaultusers::params
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	621 class { 'website::mysql':
402 76d18a918e7f Switch to more parameters IBBoard <dev@ibboard.co.uk> parents: 401 diff changeset	622 mysqluser => $::defaultusers::params::mysql_user,
76d18a918e7f Switch to more parameters IBBoard <dev@ibboard.co.uk> parents: 401 diff changeset	623 mysqlpassword => $::defaultusers::params::mysql_password,
24 204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings) IBBoard <dev@ibboard.co.uk> parents: 18 diff changeset	624 mysqlprefix => $mysqlpackage,
204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings) IBBoard <dev@ibboard.co.uk> parents: 18 diff changeset	625 mysqlsuffix => $mysqlsuffix,
110 be2b30b17a4c Switch to PHP 7 from Webtatic IBBoard <dev@ibboard.co.uk> parents: 108 diff changeset	626 phpsuffix => $php_suffix,
393 a948419a23b1 Fix MySQL package names on Ubuntu IBBoard <dev@ibboard.co.uk> parents: 390 diff changeset	627 phpmysqlsuffix => $phpmysqlsuffix
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	628 }
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	629
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	630 # Additional supporting directories that aren't served as sites
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	631 file { [ '/srv/sites/errorhandling', '/srv/sites/private', '/srv/cms' ]:
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	632 ensure => directory,
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	633 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	634 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	635
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	636 class ibboardvpsnode (
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	637 $primary_ip,
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	638 $proxy_4to6_ip_prefix = undef,
279 e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	639 $proxy_upstream = undef,
326 63e0b5149cfb Add fallback relays to Postfix IBBoard <dev@ibboard.co.uk> parents: 323 diff changeset	640 $nat64_ranges = [],
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	641 $mailserver,
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	642 $imapserver,
326 63e0b5149cfb Add fallback relays to Postfix IBBoard <dev@ibboard.co.uk> parents: 323 diff changeset	643 $mailrelays = [],
35 1bb941522ebf Handle differences in firewalling between ASO (using APF) and most other hosts (using iptables) IBBoard <dev@ibboard.co.uk> parents: 32 diff changeset	644 $firewall_cmd = 'iptables',
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	645 ){
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	646 class { 'basevpsnode':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	647 primary_ip => $primary_ip,
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	648 proxy_4to6_ip_prefix => $proxy_4to6_ip_prefix,
279 e36b7f4f85f2 Start to support IPv6 servers IBBoard <dev@ibboard.co.uk> parents: 276 diff changeset	649 proxy_upstream => $proxy_upstream,
326 63e0b5149cfb Add fallback relays to Postfix IBBoard <dev@ibboard.co.uk> parents: 323 diff changeset	650 nat64_ranges => $nat64_ranges,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	651 mailserver => $mailserver,
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	652 imapserver => $imapserver,
326 63e0b5149cfb Add fallback relays to Postfix IBBoard <dev@ibboard.co.uk> parents: 323 diff changeset	653 mailrelays => $mailrelays,
35 1bb941522ebf Handle differences in firewalling between ASO (using APF) and most other hosts (using iptables) IBBoard <dev@ibboard.co.uk> parents: 32 diff changeset	654 firewall_cmd => $firewall_cmd,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	655 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	656
267 edeedd13262c Set a sensible default timezone for VPS IBBoard <dev@ibboard.co.uk> parents: 266 diff changeset	657 # Set timezone to something sensible
edeedd13262c Set a sensible default timezone for VPS IBBoard <dev@ibboard.co.uk> parents: 266 diff changeset	658 file { "/etc/localtime":
edeedd13262c Set a sensible default timezone for VPS IBBoard <dev@ibboard.co.uk> parents: 266 diff changeset	659 ensure => 'link',
edeedd13262c Set a sensible default timezone for VPS IBBoard <dev@ibboard.co.uk> parents: 266 diff changeset	660 target => '/usr/share/zoneinfo/Europe/London',
edeedd13262c Set a sensible default timezone for VPS IBBoard <dev@ibboard.co.uk> parents: 266 diff changeset	661 }
edeedd13262c Set a sensible default timezone for VPS IBBoard <dev@ibboard.co.uk> parents: 266 diff changeset	662
446 ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	663 # Debian doesn't handle sensible depends like module names because of the underscore
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	664 # So we need to use the package name
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	665 package { "mod_cspnonce":
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	666 name => $osfamily == 'Debian' ? { true => "libapache2-mod-cspnonce", default => "mod_cspnonce" },
ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	667 ensure => installed,
410 575764c36e16 Setup CSP Nonce on the server IBBoard <dev@ibboard.co.uk> parents: 409 diff changeset	668 }
575764c36e16 Setup CSP Nonce on the server IBBoard <dev@ibboard.co.uk> parents: 409 diff changeset	669
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	670 # Common modules used by multiple sites (mod_auth_basic is safe because we HTTPS all the things)
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	671 $mods = [
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	672 'auth_basic',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	673 'authn_core',
146 816e35f86a5d Remove mod_auth_token and replace with mod_xsendfile IBBoard <dev@ibboard.co.uk> parents: 145 diff changeset	674 'authn_file',
816e35f86a5d Remove mod_auth_token and replace with mod_xsendfile IBBoard <dev@ibboard.co.uk> parents: 145 diff changeset	675 'authz_user',
816e35f86a5d Remove mod_auth_token and replace with mod_xsendfile IBBoard <dev@ibboard.co.uk> parents: 145 diff changeset	676 'deflate',
410 575764c36e16 Setup CSP Nonce on the server IBBoard <dev@ibboard.co.uk> parents: 409 diff changeset	677 'xsendfile',
575764c36e16 Setup CSP Nonce on the server IBBoard <dev@ibboard.co.uk> parents: 409 diff changeset	678 'cspnonce'
146 816e35f86a5d Remove mod_auth_token and replace with mod_xsendfile IBBoard <dev@ibboard.co.uk> parents: 145 diff changeset	679 ]
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	680 apache::mod {
146 816e35f86a5d Remove mod_auth_token and replace with mod_xsendfile IBBoard <dev@ibboard.co.uk> parents: 145 diff changeset	681 $mods:;
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	682 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	683
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	684 #Configure our sites, using templates for the custom fragments where the extra content is too long
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	685 class { "devsite":
9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	686 proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:01", default => undef }
9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	687 }
9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	688 class { "adminsite":
9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	689 proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:02", default => undef }
9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	690 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	691 website::https::multitld { 'www.ibboard':
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	692 proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:03", default => undef },
246 c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	693 custom_fragment => template("privat/apache/ibboard.fragment"),
157 c6b1b42f3e4b Move all sites to separate LetsEncrypt certs to make adding future domains easier IBBoard <dev@ibboard.co.uk> parents: 154 diff changeset	694 letsencrypt_name => 'ibboard.co.uk',
236 4519b727cc4c Make Content-Security-Policy cleaner and easier to set IBBoard <dev@ibboard.co.uk> parents: 235 diff changeset	695 csp_override => {
4519b727cc4c Make Content-Security-Policy cleaner and easier to set IBBoard <dev@ibboard.co.uk> parents: 235 diff changeset	696 "report-uri" => "https://ibboard.report-uri.com/r/d/csp/enforce",
4519b727cc4c Make Content-Security-Policy cleaner and easier to set IBBoard <dev@ibboard.co.uk> parents: 235 diff changeset	697 "default-src" => "'none'",
4519b727cc4c Make Content-Security-Policy cleaner and easier to set IBBoard <dev@ibboard.co.uk> parents: 235 diff changeset	698 "img-src" => "'self' https://live.staticflickr.com/",
4519b727cc4c Make Content-Security-Policy cleaner and easier to set IBBoard <dev@ibboard.co.uk> parents: 235 diff changeset	699 "script-src" => "'self'",
4519b727cc4c Make Content-Security-Policy cleaner and easier to set IBBoard <dev@ibboard.co.uk> parents: 235 diff changeset	700 "style-src" => "'self'",
4519b727cc4c Make Content-Security-Policy cleaner and easier to set IBBoard <dev@ibboard.co.uk> parents: 235 diff changeset	701 "font-src" => "'self'",
4519b727cc4c Make Content-Security-Policy cleaner and easier to set IBBoard <dev@ibboard.co.uk> parents: 235 diff changeset	702 "form-action" => "'self'",
4519b727cc4c Make Content-Security-Policy cleaner and easier to set IBBoard <dev@ibboard.co.uk> parents: 235 diff changeset	703 "connect-src" => "'self'",
4519b727cc4c Make Content-Security-Policy cleaner and easier to set IBBoard <dev@ibboard.co.uk> parents: 235 diff changeset	704 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	705 }
374 5f4fc00f8189 Add mail and imap redirect websites IBBoard <dev@ibboard.co.uk> parents: 364 diff changeset	706 website::https::redir { 'mail.ibboard.co.uk':
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	707 proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:03", default => undef },
374 5f4fc00f8189 Add mail and imap redirect websites IBBoard <dev@ibboard.co.uk> parents: 364 diff changeset	708 redir => 'https://ibboard.co.uk/',
5f4fc00f8189 Add mail and imap redirect websites IBBoard <dev@ibboard.co.uk> parents: 364 diff changeset	709 docroot => "${website::basedir}/ibboard",
5f4fc00f8189 Add mail and imap redirect websites IBBoard <dev@ibboard.co.uk> parents: 364 diff changeset	710 letsencrypt_name => 'ibboard.co.uk',
5f4fc00f8189 Add mail and imap redirect websites IBBoard <dev@ibboard.co.uk> parents: 364 diff changeset	711 separate_log => true,
5f4fc00f8189 Add mail and imap redirect websites IBBoard <dev@ibboard.co.uk> parents: 364 diff changeset	712 }
5f4fc00f8189 Add mail and imap redirect websites IBBoard <dev@ibboard.co.uk> parents: 364 diff changeset	713 website::https::redir { 'imap.ibboard.co.uk':
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	714 proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:03", default => undef },
374 5f4fc00f8189 Add mail and imap redirect websites IBBoard <dev@ibboard.co.uk> parents: 364 diff changeset	715 redir => 'https://ibboard.co.uk/',
5f4fc00f8189 Add mail and imap redirect websites IBBoard <dev@ibboard.co.uk> parents: 364 diff changeset	716 docroot => "${website::basedir}/ibboard",
5f4fc00f8189 Add mail and imap redirect websites IBBoard <dev@ibboard.co.uk> parents: 364 diff changeset	717 letsencrypt_name => 'ibboard.co.uk',
5f4fc00f8189 Add mail and imap redirect websites IBBoard <dev@ibboard.co.uk> parents: 364 diff changeset	718 separate_log => true,
5f4fc00f8189 Add mail and imap redirect websites IBBoard <dev@ibboard.co.uk> parents: 364 diff changeset	719 }
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	720 class { "hiveworldterrasite":
9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	721 proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:04", default => undef }
9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	722 }
9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	723 class { "bdstrikesite":
9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	724 proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:05", default => undef }
9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	725 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	726 website::https::multitld { 'www.abiknight':
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	727 proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:06", default => undef },
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	728 custom_fragment => "$website::htmlphpfragment
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	729 ErrorDocument 404 /error.php",
157 c6b1b42f3e4b Move all sites to separate LetsEncrypt certs to make adding future domains easier IBBoard <dev@ibboard.co.uk> parents: 154 diff changeset	730 letsencrypt_name => 'abiknight.co.uk',
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	731 }
435 377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	732 website::https::redir { 'www.warfoundry.co.uk':
377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	733 proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:07", default => undef },
377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	734 redir => 'https://www.ibboard.co.uk/warfoundry/',
377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	735 letsencrypt_name => 'warfoundry.co.uk',
377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	736 }
377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	737 website::https::redir { 'warfoundry.co.uk':
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	738 proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:07", default => undef },
435 377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	739 redir => 'https://www.ibboard.co.uk/warfoundry/',
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	740 letsencrypt_name => 'warfoundry.co.uk',
435 377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	741 }
377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	742 website::https::redir { 'www.warfoundry.com':
377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	743 proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:07", default => undef },
377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	744 redir => 'https://www.ibboard.co.uk/warfoundry/',
377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	745 letsencrypt_name => 'warfoundry.co.uk',
377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	746 }
377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	747 website::https::redir { 'warfoundry.com':
377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	748 proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:07", default => undef },
377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	749 redir => 'https://www.ibboard.co.uk/warfoundry/',
377fbb08568a Switch WarFoundry to redirect before domains expire IBBoard <dev@ibboard.co.uk> parents: 432 diff changeset	750 letsencrypt_name => 'warfoundry.co.uk',
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	751 }
9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	752 class { "webmailpimsite":
9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	753 proxy_4to6_ip_pim => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:08", default => undef },
9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	754 proxy_4to6_ip_webmail => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:09", default => undef },
9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	755 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	756 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	757
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	758 class adminsite ($proxy_4to6_ip) {
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	759 apache::mod { 'info':; 'status':; 'cgi':; }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	760 website::https::multitld { 'admin.ibboard':
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	761 proxy_4to6_ip => $proxy_4to6_ip,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	762 force_no_index => false,
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	763 ssl_ca_chain => '',
422 8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	764 csp_override => {
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	765 "report-uri" => "https://ibboard.report-uri.com/r/d/csp/enforce",
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	766 "img-src" => "'self' data:",
8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	767 },
426 1d6cf5d981be Try to resolve more CSP errors IBBoard <dev@ibboard.co.uk> parents: 422 diff changeset	768 csp_report_override => {
1d6cf5d981be Try to resolve more CSP errors IBBoard <dev@ibboard.co.uk> parents: 422 diff changeset	769 "img-src" => "'self' data:",
1d6cf5d981be Try to resolve more CSP errors IBBoard <dev@ibboard.co.uk> parents: 422 diff changeset	770 },
246 c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	771 custom_fragment => template("privat/apache/admin.fragment"),
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	772 }
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	773 if $osfamily == 'RedHat' {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	774 $cron_user = 'apache'
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	775 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	776 elsif $osfamily == 'Debian' {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	777 $cron_user = 'www-data'
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	778 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	779 cron { 'loadavg':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	780 command => '/usr/local/bin/run-loadavg-logger',
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	781 user => $cron_user,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	782 minute => '*/6'
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	783 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	784 cron { 'awstats':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	785 command => '/usr/local/bin/update-awstats > /srv/sites/admin/awstats.log',
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	786 user => $cron_user,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	787 hour => '*/6',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	788 minute => '0'
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	789 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	790 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	791
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	792 class hiveworldterrasite ($proxy_4to6_ip) {
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	793 website::https::multitld { 'www.hiveworldterra':
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	794 proxy_4to6_ip => $proxy_4to6_ip,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	795 force_no_www => false,
157 c6b1b42f3e4b Move all sites to separate LetsEncrypt certs to make adding future domains easier IBBoard <dev@ibboard.co.uk> parents: 154 diff changeset	796 letsencrypt_name => 'hiveworldterra.co.uk',
246 c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	797 custom_fragment => template("privat/apache/hwt.fragment"),
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	798 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	799 website::https::multitld { 'forums.hiveworldterra':
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	800 proxy_4to6_ip => $proxy_4to6_ip,
331 f69e2d197302 Separate some certs to make migration easier IBBoard <dev@ibboard.co.uk> parents: 330 diff changeset	801 letsencrypt_name => 'forums.hiveworldterra.co.uk',
246 c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	802 custom_fragment => template("privat/apache/forums.fragment"),
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	803 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	804 website::https::multitld { 'skins.hiveworldterra':
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	805 proxy_4to6_ip => $proxy_4to6_ip,
334 ee4760967d2f Separate LetsEncrypt certs IBBoard <dev@ibboard.co.uk> parents: 332 diff changeset	806 letsencrypt_name => 'skins.hiveworldterra.co.uk',
246 c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	807 custom_fragment => template("privat/apache/skins.fragment"),
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	808 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	809 website::https::redir { 'hiveworldterra.ibboard.co.uk':
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	810 proxy_4to6_ip => $proxy_4to6_ip,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	811 redir => 'https://www.hiveworldterra.co.uk/',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	812 docroot => "${website::basedir}/hiveworldterra",
334 ee4760967d2f Separate LetsEncrypt certs IBBoard <dev@ibboard.co.uk> parents: 332 diff changeset	813 letsencrypt_name => 'hiveworldterra.ibboard.co.uk',
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	814 separate_log => true,
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	815 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	816 }
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	817 class bdstrikesite ($proxy_4to6_ip) {
331 f69e2d197302 Separate some certs to make migration easier IBBoard <dev@ibboard.co.uk> parents: 330 diff changeset	818 website::https::multitld { 'www.bdstrike':
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	819 proxy_4to6_ip => $proxy_4to6_ip,
145 88f38ef7359f Add BDStrike domains IBBoard <dev@ibboard.co.uk> parents: 142 diff changeset	820 docroot_owner => $defaultusers::secondary_user,
88f38ef7359f Add BDStrike domains IBBoard <dev@ibboard.co.uk> parents: 142 diff changeset	821 docroot_group => 'editors',
157 c6b1b42f3e4b Move all sites to separate LetsEncrypt certs to make adding future domains easier IBBoard <dev@ibboard.co.uk> parents: 154 diff changeset	822 letsencrypt_name => 'bdstrike.co.uk',
246 c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	823 custom_fragment => template("privat/apache/bdstrike.fragment"),
411 83f2e944a43f Set security settings on BDStrike.co.uk IBBoard <dev@ibboard.co.uk> parents: 410 diff changeset	824 csp_override => {
83f2e944a43f Set security settings on BDStrike.co.uk IBBoard <dev@ibboard.co.uk> parents: 410 diff changeset	825 "report-uri" => "https://ibboard.report-uri.com/r/d/csp/enforce",
364 8224f42ee05b Expand BDStrike CSP to allow more styling and fonts IBBoard <dev@ibboard.co.uk> parents: 362 diff changeset	826 "font-src" => "'self' https://fonts.gstatic.com/ data:",
446 ba3c446d5a47 Update config to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 439 diff changeset	827 "img-src" => "'self' https://secure.gravatar.com/ https://ps.w.org/ https://s.w.org/ data:",
411 83f2e944a43f Set security settings on BDStrike.co.uk IBBoard <dev@ibboard.co.uk> parents: 410 diff changeset	828 "style-src" => "'self' https://fonts.googleapis.com/ 'unsafe-inline'",
83f2e944a43f Set security settings on BDStrike.co.uk IBBoard <dev@ibboard.co.uk> parents: 410 diff changeset	829 "connect-src" => "'self' https://www.sandbox.paypal.com/ https://www.paypal.com/",
83f2e944a43f Set security settings on BDStrike.co.uk IBBoard <dev@ibboard.co.uk> parents: 410 diff changeset	830 "frame-ancestors" => "'self'"
83f2e944a43f Set security settings on BDStrike.co.uk IBBoard <dev@ibboard.co.uk> parents: 410 diff changeset	831 },
83f2e944a43f Set security settings on BDStrike.co.uk IBBoard <dev@ibboard.co.uk> parents: 410 diff changeset	832 csp_report_override => {
422 8421eb25c329 Fix PHP extension loading IBBoard <dev@ibboard.co.uk> parents: 420 diff changeset	833 "report-uri" => "https://ibboard.report-uri.com/r/d/csp/reportOnly",
411 83f2e944a43f Set security settings on BDStrike.co.uk IBBoard <dev@ibboard.co.uk> parents: 410 diff changeset	834 "font-src" => "'self' https://fonts.gstatic.com/ data:", # TODO: What's generating it?
83f2e944a43f Set security settings on BDStrike.co.uk IBBoard <dev@ibboard.co.uk> parents: 410 diff changeset	835 "img-src" => "'self' https://secure.gravatar.com/ data:",
426 1d6cf5d981be Try to resolve more CSP errors IBBoard <dev@ibboard.co.uk> parents: 422 diff changeset	836 "style-src" => "'self' https://fonts.googleapis.com/ 'nonce-%{CSP_NONCE}e' 'unsafe-hashes' 'sha256-anQSeQoEnQnBulZOQkDOFf+e6xBIGmqh7M8YFT992co=' 'sha256-zJDyuABAg68wtWDFyIh+RRe+6Vm/r+BLwaNRCGNVyXI=' 'sha256-qMalr/MPLUDW4lX/rq/cGp1Eu/H0cu0Yg98pdu69Jxs=' 'sha256-mshqJ+hidJMRDeNLHknuDAeYLOPg2OTIIA3nZmHgi9U=' 'sha256-YnRUd/QjP/NuFgfjMHhNfMCqXh0RQIGdvQfMCOf6qkw=' 'sha256-EwdiFJgqhefinoeAymrWxOYW4kza2Ekos5MY0PlXYI0=' 'sha256-G4K9vh8e+37+l69S+lHTyX3CfcK95mQUgyxYPCb7uME=' 'sha256-t6oewASd7J1vBg5mQtX4hl8bg8FeegYFM3scKLIhYUc=' 'sha256-mAQYxa3mIYqoLBrm1zLu6sLajr8vUHVFLYNpl6dAakM=' 'sha256-A8foknjCsFBi1PlRehOrHq0pVySigUurqAUgZ2y2U8c=' 'sha256-biLFinpqYMtWHmXfkA1BPeCY0/fNt46SAZ+BBk5YUog=' 'sha256-WzSByVQ8yW/DKrr77TWVt7WEMzueRcfJZImOkjTBKmc=' 'sha256-efof3agGBAL/yN8TplyNbLEgDZ3wIGMK3UMYbe8slkA='",
411 83f2e944a43f Set security settings on BDStrike.co.uk IBBoard <dev@ibboard.co.uk> parents: 410 diff changeset	837 "connect-src" => "'self' https://www.sandbox.paypal.com/ https://www.paypal.com/",
236 4519b727cc4c Make Content-Security-Policy cleaner and easier to set IBBoard <dev@ibboard.co.uk> parents: 235 diff changeset	838 },
145 88f38ef7359f Add BDStrike domains IBBoard <dev@ibboard.co.uk> parents: 142 diff changeset	839 }
157 c6b1b42f3e4b Move all sites to separate LetsEncrypt certs to make adding future domains easier IBBoard <dev@ibboard.co.uk> parents: 154 diff changeset	840
235 e602c5f974ac Make a cron job for updating Wordpress IBBoard <dev@ibboard.co.uk> parents: 200 diff changeset	841 cron { 'wordpress_cron':
e602c5f974ac Make a cron job for updating Wordpress IBBoard <dev@ibboard.co.uk> parents: 200 diff changeset	842 # Run "php -f wp-cron.php" on a schedule so that we can auto-update
e602c5f974ac Make a cron job for updating Wordpress IBBoard <dev@ibboard.co.uk> parents: 200 diff changeset	843 # without giving Apache full write access!
e602c5f974ac Make a cron job for updating Wordpress IBBoard <dev@ibboard.co.uk> parents: 200 diff changeset	844 command => "/usr/local/bin/bdstrike-cron",
e602c5f974ac Make a cron job for updating Wordpress IBBoard <dev@ibboard.co.uk> parents: 200 diff changeset	845 user => $defaultusers::default_user,
e602c5f974ac Make a cron job for updating Wordpress IBBoard <dev@ibboard.co.uk> parents: 200 diff changeset	846 minute => '*/15',
e602c5f974ac Make a cron job for updating Wordpress IBBoard <dev@ibboard.co.uk> parents: 200 diff changeset	847 }
145 88f38ef7359f Add BDStrike domains IBBoard <dev@ibboard.co.uk> parents: 142 diff changeset	848 }
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	849 class devsite ($proxy_4to6_ip) {
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	850 if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '8') >= 0 {
418 dd12bb713260 Fix mod_wsgi package install on CentOS IBBoard <dev@ibboard.co.uk> parents: 417 diff changeset	851 $package_name = 'python3-mod_wsgi'
dd12bb713260 Fix mod_wsgi package install on CentOS IBBoard <dev@ibboard.co.uk> parents: 417 diff changeset	852 $mod_path = 'mod_wsgi_python3.so'
261 c3ecb1e58713 Fix more CentOS 7 vs 8 differences IBBoard <dev@ibboard.co.uk> parents: 258 diff changeset	853 } else {
418 dd12bb713260 Fix mod_wsgi package install on CentOS IBBoard <dev@ibboard.co.uk> parents: 417 diff changeset	854 $package_name = undef
dd12bb713260 Fix mod_wsgi package install on CentOS IBBoard <dev@ibboard.co.uk> parents: 417 diff changeset	855 $mod_path = undef
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	856 }
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	857 class { 'apache::mod::wsgi':
418 dd12bb713260 Fix mod_wsgi package install on CentOS IBBoard <dev@ibboard.co.uk> parents: 417 diff changeset	858 package_name => $package_name,
dd12bb713260 Fix mod_wsgi package install on CentOS IBBoard <dev@ibboard.co.uk> parents: 417 diff changeset	859 mod_path => $mod_path,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	860 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	861
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	862 website::https::multitld { 'dev.ibboard':
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	863 proxy_4to6_ip => $proxy_4to6_ip,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	864 #Make sure we're the first one hit for the tiny fraction of "no support" cases we care about (potentially Python for Mercurial!)
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	865 # http://en.wikipedia.org/wiki/Server_Name_Indication#No_support
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	866 priority => 1,
157 c6b1b42f3e4b Move all sites to separate LetsEncrypt certs to make adding future domains easier IBBoard <dev@ibboard.co.uk> parents: 154 diff changeset	867 letsencrypt_name => 'dev.ibboard.co.uk',
246 c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	868 custom_fragment => template("privat/apache/dev.fragment"),
281 af7df930a670 Add 4-to-6 proxy and mod_remoteip setup IBBoard <dev@ibboard.co.uk> parents: 279 diff changeset	869 proxy_fragment => template("privat/apache/dev-proxy.fragment"),
52 be1e9773a12c Mercurial repo versions index.php files etc, so removing index.php breaks things! IBBoard <dev@ibboard.co.uk> parents: 44 diff changeset	870 force_no_index => false,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	871 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	872 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	873
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	874 class webmailpimsite ($proxy_4to6_ip_pim, $proxy_4to6_ip_webmail) {
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	875 # Webmail and Personal Information Management (PIM) sites
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	876 website::https { 'webmail.ibboard.co.uk':
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	877 proxy_4to6_ip => $proxy_4to6_ip_webmail,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	878 force_no_index => false,
414 23eac935cffa Switch to LetsEncrypt on Webmail IBBoard <dev@ibboard.co.uk> parents: 413 diff changeset	879 letsencrypt_name => 'webmail.ibboard.co.uk',
246 c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	880 custom_fragment => template("privat/apache/webmail.fragment"),
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	881 }
396 e93588ec1ce3 Use "param" variables for settings instead of conditions IBBoard <dev@ibboard.co.uk> parents: 393 diff changeset	882 include ::apache::params
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	883 website::https { 'pim.ibboard.co.uk':
284 9431aec4d998 Switch to using IPv6 prefix and IP per site IBBoard <dev@ibboard.co.uk> parents: 281 diff changeset	884 proxy_4to6_ip => $proxy_4to6_ip_pim,
396 e93588ec1ce3 Use "param" variables for settings instead of conditions IBBoard <dev@ibboard.co.uk> parents: 393 diff changeset	885 docroot_owner => $apache::params::user,
242 7d8e664ebcc9 Change owner/group on Nextcloud for easy upgrade IBBoard <dev@ibboard.co.uk> parents: 241 diff changeset	886 docroot_group => 'editors',
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	887 force_no_index => false,
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	888 lockdown_requests => false,
429 fa3093f2dc8e Migrate NextCloud to LetsEncrypt IBBoard <dev@ibboard.co.uk> parents: 426 diff changeset	889 letsencrypt_name => 'pim.ibboard.co.uk',
265 bf2b8912c414 Make PIM site skip CSP headers - NextCloud manages them IBBoard <dev@ibboard.co.uk> parents: 264 diff changeset	890 csp => false,
bf2b8912c414 Make PIM site skip CSP headers - NextCloud manages them IBBoard <dev@ibboard.co.uk> parents: 264 diff changeset	891 csp_report => false,
246 c3fa3d65aa83 Update configs for Puppet 6 IBBoard <dev@ibboard.co.uk> parents: 242 diff changeset	892 custom_fragment => template("privat/apache/pim.fragment"),
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	893 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	894 cron { 'owncloudcron':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	895 command => "/usr/local/bin/owncloud-cron",
402 76d18a918e7f Switch to more parameters IBBoard <dev@ibboard.co.uk> parents: 401 diff changeset	896 user => $apache::params::user,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	897 minute => '*/15',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	898 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	899 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	900
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	901 class email (
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	902 $mailserver,
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	903 $imapserver,
311 51d3748f8112 Configure Dovecot (IMAP) for PROXY protocol use IBBoard <dev@ibboard.co.uk> parents: 310 diff changeset	904 $mailserver_ip,
313 49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	905 $proxy_ip = undef,
311 51d3748f8112 Configure Dovecot (IMAP) for PROXY protocol use IBBoard <dev@ibboard.co.uk> parents: 310 diff changeset	906 $proxy_upstream = [],
326 63e0b5149cfb Add fallback relays to Postfix IBBoard <dev@ibboard.co.uk> parents: 323 diff changeset	907 $nat64_ranges = [],
63e0b5149cfb Add fallback relays to Postfix IBBoard <dev@ibboard.co.uk> parents: 323 diff changeset	908 $mailrelays = [],
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	909 ){
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	910 class { 'postfix':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	911 mailserver => $mailserver,
313 49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	912 mailserver_ip => $mailserver_ip,
49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	913 mailserver_proxy => $proxy_ip,
49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	914 proxy_upstream => $proxy_upstream,
326 63e0b5149cfb Add fallback relays to Postfix IBBoard <dev@ibboard.co.uk> parents: 323 diff changeset	915 mailrelays => $mailrelays,
63e0b5149cfb Add fallback relays to Postfix IBBoard <dev@ibboard.co.uk> parents: 323 diff changeset	916 nat64_ranges => $nat64_ranges,
317 2a20a5b7f65a Swap IPv6 Postfix to "all" protocols to support PROXY IBBoard <dev@ibboard.co.uk> parents: 313 diff changeset	917 protocols => $mailserver_ip =~ Stdlib::IP::Address::V6 ? { true => 'all', default => 'ipv4' },
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	918 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	919 class { 'dovecot':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	920 imapserver => $imapserver,
311 51d3748f8112 Configure Dovecot (IMAP) for PROXY protocol use IBBoard <dev@ibboard.co.uk> parents: 310 diff changeset	921 imapserver_ip => $mailserver_ip,
313 49e66019faf7 Configure Postfix for IPv6 w/proxy IBBoard <dev@ibboard.co.uk> parents: 311 diff changeset	922 imapserver_proxy => $proxy_ip,
311 51d3748f8112 Configure Dovecot (IMAP) for PROXY protocol use IBBoard <dev@ibboard.co.uk> parents: 310 diff changeset	923 proxy_upstream => $proxy_upstream,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	924 }
177 1b605c38b375 Add missing dependencies for SpamAssassin rules IBBoard <dev@ibboard.co.uk> parents: 176 diff changeset	925 # Unspecified SpamAssassin config dependencies that started
1b605c38b375 Add missing dependencies for SpamAssassin rules IBBoard <dev@ibboard.co.uk> parents: 176 diff changeset	926 # showing up as errors in our logs
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	927 if $osfamily == 'RedHat' {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	928 $spamassassin_deps = ['perl-File-MimeInfo']
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	929 $spamassassin_dir = '/etc/mail/spamassassin/'
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	930 $amavis_dir = '/etc/amavisd/'
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	931 $amavis_service = 'amavisd'
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	932 # CentOS has a Clam service, but we call on demand (Ubuntu doesn't have a service)
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	933 service { 'clamd@amavisd':
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	934 ensure => 'stopped',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	935 enable=> 'mask',
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	936 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	937 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	938 elsif $osfamily == 'Debian' {
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	939 $spamassassin_deps = ['libfile-mimeinfo-perl']
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	940 $spamassassin_dir = '/etc/spamassassin/'
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	941 $amavis_dir = '/etc/amavis/'
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	942 $amavis_service = 'amavis'
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	943 }
df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	944 package { $spamassassin_deps:
177 1b605c38b375 Add missing dependencies for SpamAssassin rules IBBoard <dev@ibboard.co.uk> parents: 176 diff changeset	945 ensure => installed,
1b605c38b375 Add missing dependencies for SpamAssassin rules IBBoard <dev@ibboard.co.uk> parents: 176 diff changeset	946 }
140 6eef7cec8658 Remove ClamAV from server config IBBoard <dev@ibboard.co.uk> parents: 139 diff changeset	947 package { [ 'amavisd-new' ]:
85 50dd78dbf3db Fight back against spam IBBoard <dev@ibboard.co.uk> parents: 83 diff changeset	948 ensure => installed,
50dd78dbf3db Fight back against spam IBBoard <dev@ibboard.co.uk> parents: 83 diff changeset	949 tag => 'av',
50dd78dbf3db Fight back against spam IBBoard <dev@ibboard.co.uk> parents: 83 diff changeset	950 }
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	951 service { $amavis_service:
86 4f59d2fcd521 Make sure that Amavis daemon is running so mail gets delivered after reboot! IBBoard <dev@ibboard.co.uk> parents: 85 diff changeset	952 ensure => 'running',
4f59d2fcd521 Make sure that Amavis daemon is running so mail gets delivered after reboot! IBBoard <dev@ibboard.co.uk> parents: 85 diff changeset	953 enable => 'true',
4f59d2fcd521 Make sure that Amavis daemon is running so mail gets delivered after reboot! IBBoard <dev@ibboard.co.uk> parents: 85 diff changeset	954 }
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	955 file { "${amavis_dir}amavisd.conf":
85 50dd78dbf3db Fight back against spam IBBoard <dev@ibboard.co.uk> parents: 83 diff changeset	956 ensure => present,
50dd78dbf3db Fight back against spam IBBoard <dev@ibboard.co.uk> parents: 83 diff changeset	957 source => 'puppet:///private/postfix/amavisd.conf',
50dd78dbf3db Fight back against spam IBBoard <dev@ibboard.co.uk> parents: 83 diff changeset	958 tag => 'av',
50dd78dbf3db Fight back against spam IBBoard <dev@ibboard.co.uk> parents: 83 diff changeset	959 }
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	960 file { "${spamassassin_dir}local.cf":
163 4e53d77fa586 Manage SpamAssassin local config IBBoard <dev@ibboard.co.uk> parents: 162 diff changeset	961 ensure => present,
4e53d77fa586 Manage SpamAssassin local config IBBoard <dev@ibboard.co.uk> parents: 162 diff changeset	962 source => 'puppet:///private/postfix/spamassassin-local.cf',
4e53d77fa586 Manage SpamAssassin local config IBBoard <dev@ibboard.co.uk> parents: 162 diff changeset	963 tag => 'av',
4e53d77fa586 Manage SpamAssassin local config IBBoard <dev@ibboard.co.uk> parents: 162 diff changeset	964 }
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	965 file { "${spamassassin_dir}ole2macro.cf":
142 dae1088dd218 Add OLE detection to SpamAssassin without ClamAV IBBoard <dev@ibboard.co.uk> parents: 141 diff changeset	966 ensure => present,
dae1088dd218 Add OLE detection to SpamAssassin without ClamAV IBBoard <dev@ibboard.co.uk> parents: 141 diff changeset	967 source => 'puppet:///common/ole2macro.cf',
dae1088dd218 Add OLE detection to SpamAssassin without ClamAV IBBoard <dev@ibboard.co.uk> parents: 141 diff changeset	968 tag => 'av',
dae1088dd218 Add OLE detection to SpamAssassin without ClamAV IBBoard <dev@ibboard.co.uk> parents: 141 diff changeset	969 }
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	970 file { "${spamassassin_dir}ole2macro.pm":
142 dae1088dd218 Add OLE detection to SpamAssassin without ClamAV IBBoard <dev@ibboard.co.uk> parents: 141 diff changeset	971 ensure => present,
dae1088dd218 Add OLE detection to SpamAssassin without ClamAV IBBoard <dev@ibboard.co.uk> parents: 141 diff changeset	972 source => 'puppet:///common/spamassassin-vba-macro-master/ole2macro.pm',
dae1088dd218 Add OLE detection to SpamAssassin without ClamAV IBBoard <dev@ibboard.co.uk> parents: 141 diff changeset	973 tag => 'av',
dae1088dd218 Add OLE detection to SpamAssassin without ClamAV IBBoard <dev@ibboard.co.uk> parents: 141 diff changeset	974 }
85 50dd78dbf3db Fight back against spam IBBoard <dev@ibboard.co.uk> parents: 83 diff changeset	975 Package<\| tag == 'av' \|> -> File<\| tag == 'av' \|>
87 6be21a984126 Make sure that config file changes for changes trigger a reload IBBoard <dev@ibboard.co.uk> parents: 86 diff changeset	976 File<\| tag == 'av' \|> {
390 df5ad1612af7 Adapt configs to support Ubuntu IBBoard <dev@ibboard.co.uk> parents: 385 diff changeset	977 notify => Service[$amavis_service],
87 6be21a984126 Make sure that config file changes for changes trigger a reload IBBoard <dev@ibboard.co.uk> parents: 86 diff changeset	978 }
125 ca711ab45f17 Schedule Postwhite to run regularly IBBoard <dev@ibboard.co.uk> parents: 122 diff changeset	979 cron { 'Postwhite':
129 16a931df5fd7 Filter what we see in Postwhite cron output IBBoard <dev@ibboard.co.uk> parents: 128 diff changeset	980 command => "/usr/local/bin/postwhite 2>&1\| grep -vE '^(Starting\|Recursively\|Getting\|Querying\|Removing\|Sorting\|$)'",
125 ca711ab45f17 Schedule Postwhite to run regularly IBBoard <dev@ibboard.co.uk> parents: 122 diff changeset	981 user => 'root',
ca711ab45f17 Schedule Postwhite to run regularly IBBoard <dev@ibboard.co.uk> parents: 122 diff changeset	982 weekday => 0,
128 379089631403 Fix rookie cron mistake - don't run Postwhite EVERY MINUTE! IBBoard <dev@ibboard.co.uk> parents: 126 diff changeset	983 hour => 2,
379089631403 Fix rookie cron mistake - don't run Postwhite EVERY MINUTE! IBBoard <dev@ibboard.co.uk> parents: 126 diff changeset	984 minute => 0,
125 ca711ab45f17 Schedule Postwhite to run regularly IBBoard <dev@ibboard.co.uk> parents: 122 diff changeset	985 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	986 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	987
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	988 class cronjobs {
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	989 # Add Mutt for scripts that send emails, but stop it clogging the disk by keeping copies of emails
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	990 package { 'mutt':
131 0dd899a10ee1 Change all "latest" packages to "installed" IBBoard <dev@ibboard.co.uk> parents: 129 diff changeset	991 ensure => installed,
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	992 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	993 file { '/etc/Muttrc.local':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	994 content => 'set copy = no',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	995 require => Package['mutt'],
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	996 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	997
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	998 # General server-wide cron jobs
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	999 Cron { user => 'root' }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1000 cron { 'backupalldbs':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1001 command => "/usr/local/bin/backupalldbs",
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1002 monthday => "*/2",
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1003 hour => "4",
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1004 minute => "9"
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1005 }
323 002203790815 Stop running Great Firewall Against China on IPv6 machines IBBoard <dev@ibboard.co.uk> parents: 322 diff changeset	1006 # Only run the Great Firewall Against China on IPv4 (since we don't have an IPv6 list
002203790815 Stop running Great Firewall Against China on IPv6 machines IBBoard <dev@ibboard.co.uk> parents: 322 diff changeset	1007 # and the PROXY forwards the IPs to services, but not at the network level)
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1008 cron { 'greatfirewallofchina':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1009 command => '/usr/local/bin/update-great-firewall-of-china',
323 002203790815 Stop running Great Firewall Against China on IPv6 machines IBBoard <dev@ibboard.co.uk> parents: 322 diff changeset	1010 ensure => has_key($facts, 'ipaddress') ? { true => "present", default => "absent" },
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1011 hour => 3,
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1012 minute => 30
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1013 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1014 cron { 'permissions':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1015 command => '/usr/local/bin/set-permissions',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1016 hour => 3,
14 534e584f21ce Tweak time on permission setting script so that it is less likely to clash with LoadAVG run every 6 minutes IBBoard <dev@ibboard.co.uk> parents: 13 diff changeset	1017 minute => 2
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1018 }
55 ce8eaaca6a34 Update firewalling so that we block the right ports when using iptables directly IBBoard <dev@ibboard.co.uk> parents: 54 diff changeset	1019 # Since we're only managing the local server, use our script that wraps "puppet apply" instead of PuppetMaster
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1020 cron { 'puppet':
268 9f054191b9db Filter new log line from puppet-apply output IBBoard <dev@ibboard.co.uk> parents: 267 diff changeset	1021 command => '/usr/local/bin/puppet-apply \| grep -v "Compiled catalog for\\|Finished catalog run in\\|Applied catalog in"',
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1022 hour => '*/6',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1023 minute => 5
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1024 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1025 cron { 'purgecaches':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1026 command => "/usr/local/bin/purge-caches",
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1027 hour => '4',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1028 minute => '15',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1029 weekday => '1',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1030 }
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1031 # Notify of uncommitted files
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1032 cron { 'check-mercurial-committed':
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1033 command => "/usr/local/bin/check-hg-status",
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1034 hour => '4',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1035 minute => '20',
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1036 weekday => '0-6/3', #Sunday, Wednesday and Saturday morning
956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1037 }
93 74678cd7a200 Run cron job to notify of available updates IBBoard <dev@ibboard.co.uk> parents: 91 diff changeset	1038 # Notify of available updates
74678cd7a200 Run cron job to notify of available updates IBBoard <dev@ibboard.co.uk> parents: 91 diff changeset	1039 cron { 'check-yum-updates':
415 de6f43c2df66 Fix the "needs updating" regex IBBoard <dev@ibboard.co.uk> parents: 414 diff changeset	1040 command => '/usr/bin/yum check-update \| grep -E "^[^ ]+ +[0-9a-z:_\.-]+ +[^ ]+\s*\$"',
93 74678cd7a200 Run cron job to notify of available updates IBBoard <dev@ibboard.co.uk> parents: 91 diff changeset	1041 hour => '4',
74678cd7a200 Run cron job to notify of available updates IBBoard <dev@ibboard.co.uk> parents: 91 diff changeset	1042 minute => '30',
74678cd7a200 Run cron job to notify of available updates IBBoard <dev@ibboard.co.uk> parents: 91 diff changeset	1043 weekday => '0-6/3', #Sunday, Wednesday and Saturday morning
74678cd7a200 Run cron job to notify of available updates IBBoard <dev@ibboard.co.uk> parents: 91 diff changeset	1044 }
97 b69e3f6708d6 Add another regular command to check that we've not got services requiring a restart IBBoard <dev@ibboard.co.uk> parents: 96 diff changeset	1045 # And check whether anything needs restarting
b69e3f6708d6 Add another regular command to check that we've not got services requiring a restart IBBoard <dev@ibboard.co.uk> parents: 96 diff changeset	1046 cron { 'check-needs-restarting':
b69e3f6708d6 Add another regular command to check that we've not got services requiring a restart IBBoard <dev@ibboard.co.uk> parents: 96 diff changeset	1047 command => '/usr/bin/needs-restarting\|grep -v "/usr/lib/systemd\\|/usr/sbin/lvmetad\\|/usr/lib/polkit-1/polkitd"',
b69e3f6708d6 Add another regular command to check that we've not got services requiring a restart IBBoard <dev@ibboard.co.uk> parents: 96 diff changeset	1048 hour => '4',
b69e3f6708d6 Add another regular command to check that we've not got services requiring a restart IBBoard <dev@ibboard.co.uk> parents: 96 diff changeset	1049 minute => '45',
b69e3f6708d6 Add another regular command to check that we've not got services requiring a restart IBBoard <dev@ibboard.co.uk> parents: 96 diff changeset	1050 weekday => '0-6/3', #Sunday, Wednesday and Saturday morning
b69e3f6708d6 Add another regular command to check that we've not got services requiring a restart IBBoard <dev@ibboard.co.uk> parents: 96 diff changeset	1051 }
0 956e484adc12 Initial public release of Puppet configs IBBoard <dev@ibboard.co.uk> parents: diff changeset	1052 }

Mercurial > repos > other > Puppet

annotate manifests/templates.pp @ 446:ba3c446d5a47