Skip to content

Commit 4d24546

Browse files
apenneyapenney
committedJul 9, 2013
Merge pull request #235 from hunner/sites_symlinks
Sites symlinks
·
v12.3.10.8.0
2 parents 39a6e2e + 29f04d3 commit 4d24546

36 files changed

+216
-49
lines changed
 

‎manifests/default_mods.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
include apache::mod::proxy
3030
include apache::mod::proxy_http
3131
include apache::mod::userdir
32+
include apache::mod::vhost_alias
3233
apache::mod { 'actions': }
3334
apache::mod { 'auth_digest': }
3435
apache::mod { 'authn_alias': }
@@ -52,7 +53,6 @@
5253
apache::mod { 'suexec': }
5354
apache::mod { 'usertrack': }
5455
apache::mod { 'version': }
55-
apache::mod { 'vhost_alias': }
5656
}
5757
default: {}
5858
}

‎manifests/init.pp

+48-7
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
$error_documents = false,
3131
$confd_dir = $apache::params::confd_dir,
3232
$vhost_dir = $apache::params::vhost_dir,
33+
$vhost_enable_dir = $apache::params::vhost_enable_dir,
3334
$mod_dir = $apache::params::mod_dir,
3435
$mod_enable_dir = $apache::params::mod_enable_dir,
3536
$mpm_module = $apache::params::mpm_module,
@@ -84,26 +85,59 @@
8485
$purge_confd = $purge_configs
8586
}
8687

87-
file { $apache::confd_dir:
88+
Exec {
89+
path => '/bin:/sbin:/usr/bin:/usr/sbin',
90+
}
91+
92+
exec { "mkdir ${confd_dir}":
93+
creates => $confd_dir,
94+
require => Package['httpd'],
95+
}
96+
file { $confd_dir:
8897
ensure => directory,
8998
recurse => true,
9099
purge => $purge_confd,
91100
notify => Service['httpd'],
92101
require => Package['httpd'],
93102
}
94103

95-
if ! defined(File[$apache::mod_dir]) {
96-
file { $apache::mod_dir:
104+
if ! defined(File[$mod_dir]) {
105+
exec { "mkdir ${mod_dir}":
106+
creates => $mod_dir,
107+
require => Package['httpd'],
108+
}
109+
file { $mod_dir:
110+
ensure => directory,
111+
recurse => true,
112+
purge => $purge_configs,
113+
notify => Service['httpd'],
114+
require => Package['httpd'],
115+
}
116+
}
117+
118+
if $mod_enable_dir and ! defined(File[$mod_enable_dir]) {
119+
$mod_load_dir = $mod_enable_dir
120+
exec { "mkdir ${mod_enable_dir}":
121+
creates => $mod_enable_dir,
122+
require => Package['httpd'],
123+
}
124+
file { $mod_enable_dir:
97125
ensure => directory,
98126
recurse => true,
99127
purge => $purge_configs,
100128
notify => Service['httpd'],
101129
require => Package['httpd'],
102130
}
131+
} else {
132+
$mod_load_dir = $mod_dir
103133
}
104134

105-
if $apache::mod_enable_dir and ! defined(File[$apache::mod_enable_dir]) {
106-
file { $apache::mod_enable_dir:
135+
if ! defined(File[$vhost_dir]) {
136+
exec { "mkdir ${vhost_dir}":
137+
creates => $vhost_dir,
138+
require => Package['httpd'],
139+
}
140+
file { $vhost_dir:
107141
ensure => directory,
108142
recurse => true,
109143
purge => $purge_configs,
@@ -112,14 +146,21 @@
112146
}
113147
}
114148

115-
if ! defined(File[$apache::vhost_dir]) {
116-
file { $apache::vhost_dir:
149+
if $vhost_enable_dir and ! defined(File[$vhost_enable_dir]) {
150+
$vhost_load_dir = $vhost_enable_dir
151+
exec { "mkdir ${vhost_load_dir}":
152+
creates => $vhost_load_dir,
153+
require => Package['httpd'],
154+
}
155+
file { $vhost_enable_dir:
117156
ensure => directory,
118157
recurse => true,
119158
purge => $purge_configs,
120159
notify => Service['httpd'],
121160
require => Package['httpd'],
122161
}
162+
} else {
163+
$vhost_load_dir = $vhost_dir
123164
}
124165

125166
concat { $ports_file:

‎manifests/mod.pp

+15-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@
4646
group => 'root',
4747
mode => '0644',
4848
content => "LoadModule ${mod}_module ${lib_path}/${lib_REAL}\n",
49-
require => Package['httpd'],
49+
require => [
50+
Package['httpd'],
51+
Exec["mkdir ${mod_dir}"],
52+
],
53+
before => File[$mod_dir],
5054
notify => Service['httpd'],
5155
}
5256

@@ -59,7 +63,11 @@
5963
owner => 'root',
6064
group => 'root',
6165
mode => '0644',
62-
require => File["${mod}.load"],
66+
require => [
67+
File["${mod}.load"],
68+
Exec["mkdir ${enable_dir}"],
69+
],
70+
before => File[$enable_dir],
6371
notify => Service['httpd'],
6472
}
6573
# Each module may have a .conf file as well, which should be
@@ -73,7 +81,11 @@
7381
owner => 'root',
7482
group => 'root',
7583
mode => '0644',
76-
require => File["${mod}.conf"],
84+
require => [
85+
File["${mod}.conf"],
86+
Exec["mkdir ${enable_dir}"],
87+
],
88+
before => File[$enable_dir],
7789
notify => Service['httpd'],
7890
}
7991
}

‎manifests/mod/alias.pp

+2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@
99
ensure => file,
1010
path => "${apache::mod_dir}/alias.conf",
1111
content => template('apache/mod/alias.conf.erb'),
12+
require => Exec["mkdir ${apache::mod_dir}"],
13+
before => File[$apache::mod_dir],
1214
}
1315
}

‎manifests/mod/autoindex.pp

+2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
ensure => file,
66
path => "${apache::mod_dir}/autoindex.conf",
77
content => template('apache/mod/autoindex.conf.erb'),
8+
require => Exec["mkdir ${apache::mod_dir}"],
9+
before => File[$apache::mod_dir],
810
}
911
}

‎manifests/mod/cgid.pp

+2
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@
88
ensure => file,
99
path => "${apache::mod_dir}/cgid.conf",
1010
content => template('apache/mod/cgid.conf.erb'),
11+
require => Exec["mkdir ${apache::mod_dir}"],
12+
before => File[$apache::mod_dir],
1113
}
1214
}

‎manifests/mod/dav_fs.pp

+2
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@
1212
ensure => file,
1313
path => "${apache::mod_dir}/dav_fs.conf",
1414
content => template('apache/mod/dav_fs.conf.erb'),
15+
require => Exec["mkdir ${apache::mod_dir}"],
16+
before => File[$apache::mod_dir],
1517
}
1618
}

‎manifests/mod/deflate.pp

+2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
ensure => file,
66
path => "${apache::mod_dir}/deflate.conf",
77
content => template('apache/mod/deflate.conf.erb'),
8+
require => Exec["mkdir ${apache::mod_dir}"],
9+
before => File[$apache::mod_dir],
810
}
911
}

‎manifests/mod/dir.pp

+2
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@
1414
ensure => file,
1515
path => "${apache::mod_dir}/dir.conf",
1616
content => template('apache/mod/dir.conf.erb'),
17+
require => Exec["mkdir ${apache::mod_dir}"],
18+
before => File[$apache::mod_dir],
1719
}
1820
}

‎manifests/mod/disk_cache.pp

+2
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@
1212
ensure => file,
1313
path => "${apache::mod_dir}/disk_cache.conf",
1414
content => template('apache/mod/disk_cache.conf.erb'),
15+
require => Exec["mkdir ${apache::mod_dir}"],
16+
before => File[$apache::mod_dir],
1517
}
1618
}

‎manifests/mod/info.pp

+2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
ensure => file,
88
path => "${apache::mod_dir}/info.conf",
99
content => template('apache/mod/info.conf.erb'),
10+
require => Exec["mkdir ${apache::mod_dir}"],
11+
before => File[$apache::mod_dir],
1012
}
1113
}

‎manifests/mod/ldap.pp

+2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
ensure => file,
66
path => "${apache::mod_dir}/ldap.conf",
77
content => template('apache/mod/ldap.conf.erb'),
8+
require => Exec["mkdir ${apache::mod_dir}"],
9+
before => File[$apache::mod_dir],
810
}
911
}

‎manifests/mod/mime.pp

+2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
ensure => file,
66
path => "${apache::mod_dir}/mime.conf",
77
content => template('apache/mod/mime.conf.erb'),
8+
require => Exec["mkdir ${apache::mod_dir}"],
9+
before => File[$apache::mod_dir],
810
}
911
}

‎manifests/mod/mime_magic.pp

+2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
ensure => file,
66
path => "${apache::mod_dir}/mime_magic.conf",
77
content => template('apache/mod/mime_magic.conf.erb'),
8+
require => Exec["mkdir ${apache::mod_dir}"],
9+
before => File[$apache::mod_dir],
810
}
911
}

‎manifests/mod/mpm_event.pp

+2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44
ensure => file,
55
path => "${apache::mod_dir}/mpm_event.conf",
66
content => template('apache/mod/mpm_event.conf.erb'),
7+
require => Exec["mkdir ${apache::mod_dir}"],
8+
before => File[$apache::mod_dir],
79
}
810
}

‎manifests/mod/negotiation.pp

+2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
ensure => file,
66
path => "${apache::mod_dir}/negotiation.conf",
77
content => template('apache/mod/negotiation.conf.erb'),
8+
require => Exec["mkdir ${apache::mod_dir}"],
9+
before => File[$apache::mod_dir],
810
}
911
}

‎manifests/mod/passenger.pp

+2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@
99
ensure => file,
1010
path => "${apache::mod_dir}/passenger.conf",
1111
content => template('apache/mod/passenger.conf.erb'),
12+
require => Exec["mkdir ${apache::mod_dir}"],
13+
before => File[$apache::mod_dir],
1214
}
1315
}

‎manifests/mod/php.pp

+8-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
fail('apache::mod::php requires apache::mod::prefork; please enable mpm_module => \'prefork\' on Class[\'apache\']')
44
}
55
apache::mod { 'php5': }
6-
file { 'php.conf':
6+
file { 'php5.conf':
77
ensure => file,
8-
path => "${apache::mod_dir}/php.conf",
9-
content => template('apache/mod/php.conf.erb'),
10-
require => Class['apache::mod::prefork'],
8+
path => "${apache::mod_dir}/php5.conf",
9+
content => template('apache/mod/php5.conf.erb'),
10+
require => [
11+
Class['apache::mod::prefork'],
12+
Exec["mkdir ${apache::mod_dir}"],
13+
],
14+
before => File[$apache::mod_dir],
1115
}
1216
}

‎manifests/mod/prefork.pp

+6-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
file { "${apache::mod_dir}/prefork.conf":
2626
ensure => file,
2727
content => template('apache/mod/prefork.conf.erb'),
28+
require => Exec["mkdir ${apache::mod_dir}"],
29+
before => File[$apache::mod_dir],
2830
}
2931

3032
case $::osfamily {
@@ -40,8 +42,10 @@
4042
}
4143
'debian': {
4244
file { "${apache::mod_enable_dir}/prefork.conf":
43-
ensure => link,
44-
target => "${apache::mod_dir}/prefork.conf",
45+
ensure => link,
46+
target => "${apache::mod_dir}/prefork.conf",
47+
require => Exec["mkdir ${apache::mod_enable_dir}"],
48+
before => File[$apache::mod_enable_dir],
4549
}
4650
package { 'apache2-mpm-prefork':
4751
ensure => present,

‎manifests/mod/proxy.pp

+2
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@
88
ensure => file,
99
path => "${apache::mod_dir}/proxy.conf",
1010
content => template('apache/mod/proxy.conf.erb'),
11+
require => Exec["mkdir ${apache::mod_dir}"],
12+
before => File[$apache::mod_dir],
1113
}
1214
}

‎manifests/mod/proxy_html.pp

+2
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@
1818
ensure => file,
1919
path => "${apache::mod_dir}/proxy_html.conf",
2020
content => template('apache/mod/proxy_html.conf.erb'),
21+
require => Exec["mkdir ${apache::mod_dir}"],
22+
before => File[$apache::mod_dir],
2123
}
2224
}

‎manifests/mod/reqtimeout.pp

+2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
ensure => file,
66
path => "${apache::mod_dir}/reqtimeout.conf",
77
content => template('apache/mod/reqtimeout.conf.erb'),
8+
require => Exec["mkdir ${apache::mod_dir}"],
9+
before => File[$apache::mod_dir],
810
}
911
}

‎manifests/mod/setenvif.pp

+2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
ensure => file,
66
path => "${apache::mod_dir}/setenvif.conf",
77
content => template('apache/mod/setenvif.conf.erb'),
8+
require => Exec["mkdir ${apache::mod_dir}"],
9+
before => File[$apache::mod_dir],
810
}
911
}

‎manifests/mod/ssl.pp

+2
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@
1616
ensure => file,
1717
path => "${apache::mod_dir}/ssl.conf",
1818
content => template('apache/mod/ssl.conf.erb'),
19+
require => Exec["mkdir ${apache::mod_dir}"],
20+
before => File[$apache::mod_dir],
1921
}
2022
}

‎manifests/mod/status.pp

+2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
ensure => file,
66
path => "${apache::mod_dir}/status.conf",
77
content => template('apache/mod/status.conf.erb'),
8+
require => Exec["mkdir ${apache::mod_dir}"],
9+
before => File[$apache::mod_dir],
810
}
911
}

‎manifests/mod/userdir.pp

+2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@
1010
ensure => file,
1111
path => "${apache::mod_dir}/userdir.conf",
1212
content => template('apache/mod/userdir.conf.erb'),
13+
require => Exec["mkdir ${apache::mod_dir}"],
14+
before => File[$apache::mod_dir],
1315
}
1416
}

‎manifests/mod/vhost_alias.pp

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class apache::mod::vhost_alias {
2+
apache::mod { 'vhost_alias': }
3+
}

‎manifests/mod/worker.pp

+6-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
file { "${apache::mod_dir}/worker.conf":
2828
ensure => file,
2929
content => template('apache/mod/worker.conf.erb'),
30+
require => Exec["mkdir ${apache::mod_dir}"],
31+
before => File[$apache::mod_dir],
3032
}
3133

3234
case $::osfamily {
@@ -41,8 +43,10 @@
4143
}
4244
'debian': {
4345
file { "${apache::mod_enable_dir}/worker.conf":
44-
ensure => link,
45-
target => "${apache::mod_dir}/worker.conf",
46+
ensure => link,
47+
target => "${apache::mod_dir}/worker.conf",
48+
require => Exec["mkdir ${apache::mod_enable_dir}"],
49+
before => File[$apache::mod_enable_dir],
4650
}
4751
package { 'apache2-mpm-worker':
4852
ensure => present,

‎manifests/params.pp

+2-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@
7979
$confd_dir = "${httpd_dir}/conf.d"
8080
$mod_dir = "${httpd_dir}/mods-available"
8181
$mod_enable_dir = "${httpd_dir}/mods-enabled"
82-
$vhost_dir = "${httpd_dir}/sites-enabled"
82+
$vhost_dir = "${httpd_dir}/sites-available"
83+
$vhost_enable_dir = "${httpd_dir}/sites-enabled"
8384
$conf_file = 'apache2.conf'
8485
$ports_file = "${conf_dir}/ports.conf"
8586
$logroot = '/var/log/apache2'

0 commit comments

Comments
 (0)
Please sign in to comment.