Skip to content

Commit

Permalink
Bump non openstack modules to their latest masters
Browse files Browse the repository at this point in the history 
Update apache to a78617b1919f44ab32fb88219783d836a77db148

a78617b1919f44ab32fb88219783d836a77db148 Merge pull request #1308 from mpolenchuk/master
ca5e7e5dd3b727352da7ca5328305188987d3db7 Merge pull request #1311 from occelebi/ssl
5ab89d9220b0995426db15d6b4156789ba919599 Merge pull request #1313 from jewjitsu/fix_indent
bb456f1abf1a6a77d14fd37cbc500c77204e9559 Merge pull request #1310 from occelebi/proxy
12b695ab82c9a344e87d3f73b4dae1864cb90dac the custom fragment needs to be indented two spaces so that it lines up with the rest of the configuration
a38918431c0e3d41cd8f6031fab564398215d477 Merge pull request #1309 from occelebi/domain
2a6085929cba0ca4be759ea4d514143dced11dac Merge pull request #1305 from jasonhancock/bug-el7-module-dir
e825422b0080e66b32cd05ed51b5ccae69325c74 EL7 uses conf.modules.d directory for modules.
0ab0e393f0e7254bc28f69b624cf212f120a254c Support the mod_ssl SSLProxyVerify directive
7db484aacbebba67a879b195d83bfc604c619daf Add ProxyPreserveHost off mode explicitly
f001dfb231f41aac73d97a7878eb29c9e4880c24 Support ProxPassReverseCookieDomain directive (mod_proxy)
05437c0b6e4dd084b2336565aa13a8d152f97071 Merge pull request #1306 from quixoten/request_headers_order
6b8aa3ae30d5033b88d57eae622a8bfef91f1bf8 Put headers and request headers before proxy
cf84e97e6a75dfaa9195d98b0917bfd2168badd8 Merge pull request #1304 from roidelapluie/vhost-directory-proxy-provider
5ed3dbe93bda0b8c066ee6f712b6b78a9ef0810f Merge pull request #1301 from timogoebel/fix_rewrite_validation
e6837d8a5e8f481295fe1a45d9d1a6bd950c4028 Add X-Forwarded-For into log_formats defaults
57d18900ae86c27f224c3e72b69b81ac17c8a79d Merge pull request #1307 from bmjen/fix-fastcgi
e90496f9671333eec2ffb1eeb1afe7bbdfc27059 (maint) fixes fastcgi tests on ubuntu lucid
407af7b70d90ef2897d062bf00ca11f78cd25608 Support proxy provider for vhost directories
704b3e1b401384515c40630d0248d65455493c75 Merge pull request #1303 from bmjen/fix-fastcgi
2e15018dd24d74c78a50a9483cf39b791f3ff7ec (maint) fixes the fastcgi test for debian and older ubuntu releases
791c20f33518245c691739aa06880cbe5cfb832b Merge pull request #1302 from pabelanger/temp/testing
aae1a6664efc200640eccd203db6831dd57f8d71 Limit fastcgi testing to Debian osfamily
963597dd55f95e47a31597b4df0db83ea5b21186 Merge pull request #1300 from pabelanger/temp/pcci-centos
530adf44da90a5d7438f13fa797afddc0da60ac6 Skip fastcgi acceptance testing for Centos 7
924511e1b1ceef79cd06a4833f883534dd48c125 fix validation error when empty array is passed as rewrites parameter
cdd81dbf3463c73e6abfaf937f929821baff73dd Merge pull request #1299 from pabelanger/temp/typo
af214ea39edca965c1ba481f6287759e63112afd Fix syntax error with versioncmp

Change-Id: I819ddd8114356ca8b35d5d35a53a1be01356feca

Update firewall to 9df7e883be758f8f340c720ef7d7022f10c4d842

9df7e883be758f8f340c720ef7d7022f10c4d842 Merge pull request #596 from bmjen/fix-ci
b738536f50770ad5eeacf56fe47f376087bb8871 (maint) fixes acceptance tests
79eeb807b27e395795c06191f7ea32f6430cfa39 Merge pull request #595 from bmjen/fix-ci
0d9fdd3788b383260364ece5f8fd7d88630e3023 (maint) fixes typo in firewall acceptance test.
8f8b66ccd8b266c5157f6d9018e253fc6ba4a68a Merge pull request #594 from mentat/fix_ci_bug
f9e5adac831f9cc0d9c9ec78c579dcd885469e32 Fix for CI acceptance fail.
65b8916924688a47b0c20723f333c732b653e88c Merge pull request #593 from mlosapio/feature/log-uid
703b63b08c2d93e0aa653da30d515ec9e3e0f684 Adding in log_uid boolean for LOG
170ecd183b6154ea6b095fc375f72635f49870f1 Merge pull request #579 from maxvozeler/fix/chain_f_fix
b52b0eb96209b29c349d79a4fc8ca5d5acbf2eb2 Fix handling of chain names that contain -f
e6830af827a9271bd9dfa928eee6129c48e4cb01 Merge pull request #592 from puppetlabs/1.7.x
71c659f Merge pull request #580 from tphoney/release_1.7.2
ca8efac Merge pull request #591 from jonnytpuppet/1.7.x_rel_prep_ci_fixes
d3d44ae Updated logic to debian manifest file
0379c4e (MAINT) - Commented out CLUSTERIP tests as there are suspicions that the ipt module is causing system reboots.
8289fc5 Unit test fixes
ef6bd3d More file renames
5661b28 Rename internal custom nodeset files
758d0a2 Further nodeset changes from internal CI
dd275c3 Added nodeset files for internal Puppet CI.
1ad639746bf77d304494dc77bc5fa473ddb18dbb Merge pull request #590 from jonnytpuppet/fact_variable_fix
4a9bdb4fe535d1cbba412782358dc4e133ba8b82 Updated logic to debian manifest file
e7f3937e8af90ecd451537a05c8cfea6a6e42fb4 Merge pull request #589 from DavidS/modules-2866-add-sctp
3756b4cb2b17cd1686bd82593e58f29dba4d3e9a Add: sctp-protocol to "proto"-Parameter
d33d0eb66d0b36ad9feecd2ade42f76a581612a1 Merge pull request #588 from jonnytpuppet/hang_fix2
3370e766244bbf3b2685922662d56fbea0ef7551 (MAINT) - Commented out CLUSTERIP tests as there are suspicions that the ipt module is causing system reboots.
6ac58405d79cd8db42c003ba683f526c0df75043 Merge pull request #587 from jonnytpuppet/unit_test_fix
d27d72f312a32533ef5be15333731816c9bf5178 Unit test fixes
118e282eee877c4b9c1d4da89bd9ff49a73d933f Merge pull request #586 from jonnytpuppet/hang_fix2
bbf8d20f92760e697fd12a98c796cdc9e5065b9c More file renames
c036d5ebaed29d48b3a6993e31d42ebad209bff5 Merge pull request #585 from jonnytpuppet/hang_fix2
823c8c72621130031c294ff769b5677aa13cca91 Rename internal custom nodeset files
1ac12fc3047ae5680affbbd9fcbb7793ade314d9 Merge pull request #584 from jonnytpuppet/hang_fix2
2a088c0fa65ab77752306c6123276025240d1402 Further nodeset changes from internal CI
badb2bd268fa2871359af78fbf3ab14344d35639 Merge pull request #582 from jonnytpuppet/hang_fix
03d708e15ef12a08a4259d1efe7004d31e93df3a Added nodeset files for internal Puppet CI.
e17524d release prep 1.7.2

Change-Id: Ibbe28dc5f3a38c48cd982ea80d992ab3f521df6e

Update fluentd to ddc5f0e4c6c53d15f0cbd34f74bfaa91a0fb299f

ddc5f0e4c6c53d15f0cbd34f74bfaa91a0fb299f Merge pull request #1 from EmilienM/file/fullpath
31fde18d4910a87f4e54e58501361df1364e74f0 Manage td-agent.conf file with a fully qualified path

Change-Id: I8ca655e322a23a714fed6ddf62cef86b95ea2309

Update mongodb to 3bcfc75229c4faffe5ccfe9caf1278a54ef0f7cc

3bcfc75229c4faffe5ccfe9caf1278a54ef0f7cc Merge pull request redhat-openstack#237 from erikanderson/normalize_template_spacing
38ceb81e36bbbb844039e12fb8aebb43cb2cef0d Merge pull request redhat-openstack#232 from GoozeyX/squashed_forpull
2537fc4dc770c1e1a46567691aa7e7f76961fb52 added yum proxy options
9b9f7571aed4401197437659b31d8d5ac3849e4e Normalize spacing in template

Change-Id: I89cf252016e3ccfb794afdf378f5d7561fc967d3

Update mysql to 5e7b999615bf99cc307b570c3eb27610d08df3c7

5e7b999615bf99cc307b570c3eb27610d08df3c7 Merge pull request #784 from vicinus/master
3a49209a6f7f4df98e304840ef147e5496fc780f ensure if service restart to wait till mysql is up
58a55ade47cac1f4dc102f422408c0252a204cd0 Merge pull request #789 from elconas/fix_mysql576_pull_rebase3
7efc93c3c5b9c9f7893a2914e4249e85a8879407 Fixed new mysql_datadir provider on CentOS for MySQl 5.7.6 compatibility
45419fde6d7da5aa8914dcc3fc4629384c9db9e1 Merge pull request #787 from obi11235/master
c353259fd95e58ef3ef4b2955294e2186b46efa2 Merge pull request #769 from gabriel403/master
681d4f856fd1ccda1a6152fdb6622f110827431b Ubuntu vivid should use systemd not upstart
3a29c5e5524024df72c3152022640a5e369faf86 Fixing error when disabling service management and the service does not exist
51950bf2d11b071cff21bf86379e245fd08f2070 Merge pull request #786 from DavidS/fix-576-rebase-of-763
bdf4d0f52dfc244d10bbd5b67efb791a39520ed2 Fixed MySQL 5.7.6++ compatibility
60393f7d4a42d96e67436249b940a2374bffbe77 Merge branch '3.6.x' into 'master'
f06cc1269c0da682292d46e275d6da6442e73556 Merge pull request #572 from sharumpe/ticket/MODULES-1337-MariaDB_for_OpenSuSE_13.1
85e4916 Merge pull request #780 from tphoney/release_3.6.2
9e2de7f 3.6.2 release prep
3a6a6c63580a71058aef74176d461547a3f0a660 Checking major release instead of specific release per @cmurphy.
47c1eb7386dcc39ac06b5947574ac07237b7a82c Merging with upstream changes from https://github.com/puppetlabs/puppetlabs-mysql.git
d095721 Update changelog
542c43e Improved user validation and munging
1d82477 Merge pull request #756 from bmjen/3.6.1_prep
f63b7d1 updates to 3.6.1 prep
58bb3b9 Merge pull request #755 from mhaskel/3.6.1-prep
f4b49f2 3.6.1 prep
daa4b62 Merge pull request #754 from mhaskel/ff_to_master
d6bdd4c Compatibility with PE 3.3
9d5816a Fixes improper use of function 'warn' in backup manifest of server.
54540324ea580ba711ea28b7de447485486f6ac1 Using mariadb in OpenSuSE >= 13.1.

Change-Id: I15dcc1ba2f19ba78a6de71b2a58cff0f66e08adc

Update rabbitmq to 67b9acc9a37faf2e15eae686e6b17642f82bdc40

67b9acc9a37faf2e15eae686e6b17642f82bdc40 Merge pull request #420 from nibalizer/style
47ab06a091e056390ac1de68b7c020828b7130a4 Minor style cleanup
5f428e92f1d956c5ad37bb7dec81306feb92df94 Merge pull request #404 from BashtonLtd/master
ee9359963ce64d5ecd87b40044d68ef56d8fa546 Merge pull request #406 from br0ch0n/fix_apt_update
0f35f259c84927f7ed79ae2797c8e81be1074fba Merge pull request #410 from ericpfisher/better-error-for-non-string-value
de9d5143eb558fa03d6bf401d1a62d4d7d9bf7d3 Merge pull request #412 from madAndroid/MODULES-2815-federation-upstream-fix
10fcb9d0cc85cf6d88a94aff987f978ba3209a0d Merge pull request #419 from nibalizer/install_helper
b4f635f359e9e1f8f1bb7cd91d5279e2624e82b7 Use puppetlabs install_helper
28b5af1c130fd1964d8af7fefa45ae6d8988e645 don't process line if it's a federated upstream queue
c013d165eb46f72b86b840c9484d9f5fda7870d3 Better error when definition value is not a string
56659fcb3ffdd10a9516de3e3de14a7b5e95306d Fixing pinning for apt on Debian based distros
995768b7cfa6b0b778152f6bbd8a374f15b6f520 MODULES-2645 add apt::update requirement

Change-Id: I330752b365866ba01e654db47b3f8be2272114e4

Update haproxy to 8b7f2765f18222821d6ec2967e088522e4d64197

8b7f2765f18222821d6ec2967e088522e4d64197 Merge pull request redhat-openstack#203 from antaflos/support-maps
af870391c1b5d45c41c018369e6d2546528b5233 Merge pull request redhat-openstack#200 from jpadams/master
866ffbe903e1d6c9d486f3e00d27765c91c9d05c Remove ssl-hello-chk from default options
1224651ebafc0176f70855fcd9a91225fc71b0ae Fix determining $haproxy::config_dir in haproxy::instance
65ea4481f9611a242b38e776955adf3593e59ea8 Add support for managing map files
92b97f0c9532c1f6d5cf9a1358f68c75cf367cb0 Merge pull request redhat-openstack#208 from arteal/patch-1
75e4abf34ae95393d84a24cfe14a48d4d0456730 Merge pull request redhat-openstack#209 from puppetlabs/1.3.x
6a003d490718a93533cfdd8c57e13d6b669661f3 Merge pull request redhat-openstack#207 from tlimoncelli/validate_hash_options
43af8e5213aff72ea2e2831d189a4014c002ec85 Fix port parameter name on haproxy::peer defined type
1f0b8552d47fb1ef04c4be7457b0b7e6ac82d905 Merge pull request redhat-openstack#206 from tphoney/release_1.3.1
9b8ccedcad1af831bff268eba5e345627cfe81b3 1.3.1 release prep
478b02904533ef84ee8d960d736828312273fed4 Validate global_options and defaults_options.

Change-Id: Ia9af5ec68a46c184281a0683c566d948428200da
  • Loading branch information
@xbezdick
xbezdick committed Jan 7, 2016
1 parent 7bbd603 commit c100037
Show file tree
Hide file tree
Showing 102 changed files with 1,893 additions and 463 deletions.
14 changes: 7 additions & 7 deletions Puppetfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mod 'aodh',
:git => 'https://github.com/openstack/puppet-aodh.git'

mod 'apache',
:commit => '13797dadb81b99bd16375ef2d15edd9976edf326',
:commit => 'a78617b1919f44ab32fb88219783d836a77db148',
:git => 'https://github.com/puppetlabs/puppetlabs-apache.git'

mod 'aviator',
Expand Down Expand Up @@ -55,11 +55,11 @@ mod 'elasticsearch',
:git => 'https://github.com/elastic/puppet-elasticsearch.git'

mod 'firewall',
:commit => '1b6cc9192150d9521cc70301d0452daf189a63f7',
:commit => '9df7e883be758f8f340c720ef7d7022f10c4d842',
:git => 'https://github.com/puppetlabs/puppetlabs-firewall.git'

mod 'fluentd',
:commit => 'b462da7d1c6290afba38fd7e64226990ecf795c7',
:commit => 'ddc5f0e4c6c53d15f0cbd34f74bfaa91a0fb299f',
:git => 'https://github.com/soylent/konstantin-fluentd.git'

mod 'galera',
Expand All @@ -83,7 +83,7 @@ mod 'gnocchi',
:git => 'https://github.com/openstack/puppet-gnocchi.git'

mod 'haproxy',
:commit => 'a1cd826990bb7e5d015418b679755aa6606ec13b',
:commit => '8b7f2765f18222821d6ec2967e088522e4d64197',
:git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'

mod 'heat',
Expand Down Expand Up @@ -147,11 +147,11 @@ mod 'module-data',
:git => 'https://github.com/ripienaar/puppet-module-data.git'

mod 'mongodb',
:commit => 'a5d6e5d36fb1007534bca85fd277a678e6c5a2ee',
:commit => '3bcfc75229c4faffe5ccfe9caf1278a54ef0f7cc',
:git => 'https://github.com/puppetlabs/puppetlabs-mongodb.git'

mod 'mysql',
:commit => '7daa2979ef41545e9c9a3fbf7c670f2a7927afba',
:commit => '5e7b999615bf99cc307b570c3eb27610d08df3c7',
:git => 'https://github.com/puppetlabs/puppetlabs-mysql.git'

mod 'n1k_vsm',
Expand Down Expand Up @@ -203,7 +203,7 @@ mod 'qpid',
:git => 'https://github.com/dprince/puppet-qpid'

mod 'rabbitmq',
:commit => '3d74c2d77bd482f59ea919e54d24589487221702',
:commit => '67b9acc9a37faf2e15eae686e6b17642f82bdc40',
:git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq.git'

mod 'redis',
Expand Down
10 changes: 7 additions & 3 deletions apache/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2260,13 +2260,13 @@ apache::vhost { 'site.name.fdqn':
{ 'path' => '/f', 'url' => 'http://backend-f/',
'setenv' => ['proxy-nokeepalive 1','force-proxy-request-1.0 1']},
{ 'path' => '/g', 'url' => 'http://backend-g/',
'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}], },
'reverse_cookies' => [{'path' => '/g', 'url' => 'http://backend-g/',}, {'domain' => 'http://backend-g', 'url' => 'http:://backend-g',},], },
],
}
~~~

`reverse_urls` is optional and can be an array or a string. It is useful when used with `mod_proxy_balancer`.
`reverse_cookies` is optional and is used to set ProxyPassReverseCookiePath.
`reverse_cookies` is optional and is used to set ProxyPassReverseCookiePath and/or ProxyPassReverseCookieDomain.
`params` is an optional parameter. It allows to provide the ProxyPass key=value parameters (Connection settings).
`setenv` is optional and is an array to set environment variables for the proxy directive, for details see http://httpd.apache.org/docs/current/mod/mod_proxy.html#envsettings

Expand Down Expand Up @@ -2561,7 +2561,7 @@ The `directories` parameter within the `apache::vhost` class passes an array of

The `path` key sets the path for the directory, files, and location blocks. Its value must be a path for the 'directory', 'files', and 'location' providers, or a regex for the 'directorymatch', 'filesmatch', or 'locationmatch' providers. Each hash passed to `directories` **must** contain `path` as one of the keys.

The `provider` key is optional. If missing, this key defaults to 'directory'. Valid values for `provider` are 'directory', 'files', 'location', 'directorymatch', 'filesmatch', or 'locationmatch'. If you set `provider` to 'directorymatch', it uses the keyword 'DirectoryMatch' in the Apache config file.
The `provider` key is optional. If missing, this key defaults to 'directory'. Valid values for `provider` are 'directory', 'files', 'proxy', 'location', 'directorymatch', 'filesmatch', 'proxymatch' or 'locationmatch'. If you set `provider` to 'directorymatch', it uses the keyword 'DirectoryMatch' in the Apache config file.

General `directories` usage looks something like

Expand Down Expand Up @@ -3174,6 +3174,10 @@ Sets the [SSLVerifyDepth](http://httpd.apache.org/docs/current/mod/mod_ssl.html#
}
~~~

##### `ssl_proxy_verify`

Sets the [SSLProxyVerify](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyverify) directive, which configures certificate verification of the remote server when a proxy is configured to forward requests to a remote SSL server. Defaults to 'undef'.

##### `ssl_proxy_machine_cert`

Sets the [SSLProxyMachineCertificateFile](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxymachinecertificatefile) directive, which specifies an all-in-one file where you keep the certs and keys used for this server to authenticate itself to remote servers. This file should be a concatenation of the PEM-encoded certificate files in order of preference. Defaults to 'undef'.
Expand Down
5 changes: 4 additions & 1 deletion apache/manifests/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@
$server_root = '/etc/httpd'
$conf_dir = "${httpd_dir}/conf"
$confd_dir = "${httpd_dir}/conf.d"
$mod_dir = "${httpd_dir}/conf.d"
$mod_dir = $::apache::version::distrelease ? {
'7' => "${httpd_dir}/conf.modules.d",
default => "${httpd_dir}/conf.d",
}
$mod_enable_dir = undef
$vhost_dir = "${httpd_dir}/conf.d"
$vhost_enable_dir = undef
Expand Down
78 changes: 43 additions & 35 deletions apache/manifests/vhost.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
$ssl_honorcipherorder = undef,
$ssl_verify_client = undef,
$ssl_verify_depth = undef,
$ssl_proxy_verify = undef,
$ssl_proxy_check_peer_cn = undef,
$ssl_proxy_check_peer_name = undef,
$ssl_proxy_machine_cert = undef,
Expand Down Expand Up @@ -158,7 +159,9 @@
validate_bool($ssl_proxyengine)
if $rewrites {
validate_array($rewrites)
validate_hash($rewrites[0])
unless empty($rewrites) {
validate_hash($rewrites[0])
}
}

# Input validation begins
Expand Down Expand Up @@ -234,6 +237,10 @@
validate_string($docroot)
}

if $ssl_proxy_verify {
validate_re($ssl_proxy_verify,'^(none|optional|require|optional_no_ca)$',"${ssl_proxy_verify} is not permitted for ssl_proxy_verify. Allowed values are 'none', 'optional', 'require' or 'optional_no_ca'.")
}

if $ssl_proxy_check_peer_cn {
validate_re($ssl_proxy_check_peer_cn,'(^on$|^off$)',"${ssl_proxy_check_peer_cn} is not permitted for ssl_proxy_check_peer_cn. Allowed values are 'on' or 'off'.")
}
Expand Down Expand Up @@ -674,6 +681,26 @@
}
}

# Template uses:
# - $headers
if $headers and ! empty($headers) {
concat::fragment { "${name}-header":
target => "${priority_real}${filename}.conf",
order => 140,
content => template('apache/vhost/_header.erb'),
}
}

# Template uses:
# - $request_headers
if $request_headers and ! empty($request_headers) {
concat::fragment { "${name}-requestheader":
target => "${priority_real}${filename}.conf",
order => 150,
content => template('apache/vhost/_requestheader.erb'),
}
}

# Template uses:
# - $proxy_dest
# - $proxy_pass
Expand All @@ -683,7 +710,7 @@
if $proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match {
concat::fragment { "${name}-proxy":
target => "${priority_real}${filename}.conf",
order => 140,
order => 160,
content => template('apache/vhost/_proxy.erb'),
}
}
Expand All @@ -693,7 +720,7 @@
if $rack_base_uris {
concat::fragment { "${name}-rack":
target => "${priority_real}${filename}.conf",
order => 150,
order => 170,
content => template('apache/vhost/_rack.erb'),
}
}
Expand All @@ -703,7 +730,7 @@
if $passenger_base_uris {
concat::fragment { "${name}-passenger_uris":
target => "${priority_real}${filename}.conf",
order => 155,
order => 175,
content => template('apache/vhost/_passenger_base_uris.erb'),
}
}
Expand All @@ -724,7 +751,7 @@
if ($redirect_source and $redirect_dest) or ($redirectmatch_status and $redirectmatch_regexp and $redirectmatch_dest) {
concat::fragment { "${name}-redirect":
target => "${priority_real}${filename}.conf",
order => 160,
order => 180,
content => template('apache/vhost/_redirect.erb'),
}
}
Expand All @@ -738,7 +765,7 @@
if $rewrites or $rewrite_rule {
concat::fragment { "${name}-rewrite":
target => "${priority_real}${filename}.conf",
order => 170,
order => 190,
content => template('apache/vhost/_rewrite.erb'),
}
}
Expand All @@ -749,7 +776,7 @@
if ( $scriptalias or $scriptaliases != [] ) {
concat::fragment { "${name}-scriptalias":
target => "${priority_real}${filename}.conf",
order => 180,
order => 200,
content => template('apache/vhost/_scriptalias.erb'),
}
}
Expand All @@ -759,7 +786,7 @@
if $serveraliases and ! empty($serveraliases) {
concat::fragment { "${name}-serveralias":
target => "${priority_real}${filename}.conf",
order => 190,
order => 210,
content => template('apache/vhost/_serveralias.erb'),
}
}
Expand All @@ -770,7 +797,7 @@
if ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) {
concat::fragment { "${name}-setenv":
target => "${priority_real}${filename}.conf",
order => 200,
order => 220,
content => template('apache/vhost/_setenv.erb'),
}
}
Expand All @@ -796,20 +823,21 @@
if $ssl {
concat::fragment { "${name}-ssl":
target => "${priority_real}${filename}.conf",
order => 210,
order => 230,
content => template('apache/vhost/_ssl.erb'),
}
}

# Template uses:
# - $ssl_proxyengine
# - $ssl_proxy_verify
# - $ssl_proxy_check_peer_cn
# - $ssl_proxy_check_peer_name
# - $ssl_proxy_machine_cert
if $ssl_proxyengine {
concat::fragment { "${name}-sslproxy":
target => "${priority_real}${filename}.conf",
order => 210,
order => 230,
content => template('apache/vhost/_sslproxy.erb'),
}
}
Expand All @@ -825,7 +853,7 @@
if $auth_kerb {
concat::fragment { "${name}-auth_kerb":
target => "${priority_real}${filename}.conf",
order => 210,
order => 230,
content => template('apache/vhost/_auth_kerb.erb'),
}
}
Expand All @@ -837,7 +865,7 @@
if $suphp_engine == 'on' {
concat::fragment { "${name}-suphp":
target => "${priority_real}${filename}.conf",
order => 220,
order => 240,
content => template('apache/vhost/_suphp.erb'),
}
}
Expand All @@ -848,7 +876,7 @@
if ($php_values and ! empty($php_values)) or ($php_flags and ! empty($php_flags)) {
concat::fragment { "${name}-php":
target => "${priority_real}${filename}.conf",
order => 220,
order => 240,
content => template('apache/vhost/_php.erb'),
}
}
Expand All @@ -858,29 +886,9 @@
# - $php_admin_flags
if ($php_admin_values and ! empty($php_admin_values)) or ($php_admin_flags and ! empty($php_admin_flags)) {
concat::fragment { "${name}-php_admin":
target => "${priority_real}${filename}.conf",
order => 230,
content => template('apache/vhost/_php_admin.erb'),
}
}

# Template uses:
# - $headers
if $headers and ! empty($headers) {
concat::fragment { "${name}-header":
target => "${priority_real}${filename}.conf",
order => 240,
content => template('apache/vhost/_header.erb'),
}
}

# Template uses:
# - $request_headers
if $request_headers and ! empty($request_headers) {
concat::fragment { "${name}-requestheader":
target => "${priority_real}${filename}.conf",
order => 250,
content => template('apache/vhost/_requestheader.erb'),
content => template('apache/vhost/_php_admin.erb'),
}
}

Expand Down
11 changes: 2 additions & 9 deletions apache/spec/acceptance/apache_ssl_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
require 'spec_helper_acceptance'
require_relative './version.rb'

case fact('osfamily')
when 'RedHat'
vhostd = '/etc/httpd/conf.d'
when 'Debian'
vhostd = '/etc/apache2/sites-available'
end

describe 'apache ssl' do

describe 'ssl parameters' do
Expand All @@ -28,7 +21,7 @@ class { 'apache':
apply_manifest(pp, :catch_failures => true)
end

describe file("#{vhostd}/15-default-ssl.conf") do
describe file("#{$vhost_dir}/15-default-ssl.conf") do
it { is_expected.to be_file }
it { is_expected.to contain 'SSLCertificateFile "/tmp/ssl_cert"' }
it { is_expected.to contain 'SSLCertificateKeyFile "/tmp/ssl_key"' }
Expand Down Expand Up @@ -74,7 +67,7 @@ class { 'apache':
apply_manifest(pp, :catch_failures => true)
end

describe file("#{vhostd}/25-test_ssl.conf") do
describe file("#{$vhost_dir}/25-test_ssl.conf") do
it { is_expected.to be_file }
it { is_expected.to contain 'SSLCertificateFile "/tmp/ssl_cert"' }
it { is_expected.to contain 'SSLCertificateKeyFile "/tmp/ssl_key"' }
Expand Down
22 changes: 4 additions & 18 deletions apache/spec/acceptance/class_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
require 'spec_helper_acceptance'
require_relative './version.rb'

describe 'apache class' do
case fact('osfamily')
when 'RedHat'
package_name = 'httpd'
service_name = 'httpd'
when 'Debian'
package_name = 'apache2'
service_name = 'apache2'
when 'FreeBSD'
package_name = 'apache24'
service_name = 'apache24'
when 'Gentoo'
package_name = 'www-servers/apache'
service_name = 'apache2'
end

context 'default parameters' do
it 'should work with no errors' do
pp = <<-EOS
Expand All @@ -27,11 +13,11 @@ class { 'apache': }
expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
end

describe package(package_name) do
describe package($package_name) do
it { is_expected.to be_installed }
end

describe service(service_name) do
describe service($service_name) do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end
Expand Down Expand Up @@ -80,7 +66,7 @@ class { 'apache':
apply_manifest(pp, :catch_changes => true)
end

describe service(service_name) do
describe service($service_name) do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end
Expand Down
Loading

0 comments on commit c100037

Please sign in to comment.