Skip to content

Commit a1c95aa

Browse files
david22swandavid22swan
committed
(syntax) Additional syntax fixes
1 parent a4c753a commit a1c95aa

File tree

8 files changed

+86
-86
lines changed

8 files changed

+86
-86
lines changed

‎manifests/custom_config.pp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,18 @@
4949
# show_diff property for configuration file resource
5050
#
5151
define apache::custom_config (
52-
Enum['absent', 'present'] $ensure = 'present',
53-
String $confdir = $apache::confd_dir,
54-
Optional[String] $content = undef,
55-
Variant[String,Boolean] $priority = '25',
56-
Optional[String] $source = undef,
57-
String $verify_command = $apache::params::verify_command,
58-
Boolean $verify_config = true,
59-
Optional[String] $filename = undef,
60-
Optional[String] $owner = undef,
61-
Optional[String] $group = undef,
62-
Optional[String] $file_mode = undef,
63-
Boolean $show_diff = true,
52+
Enum['absent', 'present'] $ensure = 'present',
53+
String $confdir = $apache::confd_dir,
54+
Optional[String] $content = undef,
55+
Variant[Integer,String,Boolean] $priority = '25',
56+
Optional[String] $source = undef,
57+
String $verify_command = $apache::params::verify_command,
58+
Boolean $verify_config = true,
59+
Optional[String] $filename = undef,
60+
Optional[String] $owner = undef,
61+
Optional[String] $group = undef,
62+
Optional[String] $file_mode = undef,
63+
Boolean $show_diff = true,
6464
) {
6565
if $content and $source {
6666
fail('Only one of $content and $source can be specified.')

‎manifests/mod/authn_dbd.pp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
#
3030
class apache::mod::authn_dbd (
3131
Optional[String] $authn_dbd_params,
32-
String $authn_dbd_dbdriver = 'mysql',
33-
Optional[String] $authn_dbd_query = undef,
34-
String $authn_dbd_min = '4',
35-
String $authn_dbd_max = '20',
36-
String $authn_dbd_keep = '8',
37-
String $authn_dbd_exptime = '300',
38-
Optional[String] $authn_dbd_alias = undef,
32+
String $authn_dbd_dbdriver = 'mysql',
33+
Optional[String] $authn_dbd_query = undef,
34+
Variant[String,Integer] $authn_dbd_min = '4',
35+
Variant[String,Integer] $authn_dbd_max = '20',
36+
Variant[String,Integer] $authn_dbd_keep = '8',
37+
Variant[String,Integer] $authn_dbd_exptime = '300',
38+
Optional[String] $authn_dbd_alias = undef,
3939
) inherits apache::params {
4040
include apache
4141
include apache::mod::dbd

‎manifests/mod/event.pp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,18 @@
4747
# @see https://httpd.apache.org/docs/current/mod/event.html for additional documentation.
4848
# @note Unsupported platforms: SLES: all
4949
class apache::mod::event (
50-
Variant[String,Boolean] $startservers = '2',
51-
Variant[String,Boolean] $maxclients = '150',
52-
Optional[Variant[String,Boolean]] $maxrequestworkers = undef,
53-
Variant[String,Boolean] $minsparethreads = '25',
54-
Variant[String,Boolean] $maxsparethreads = '75',
55-
Variant[String,Boolean] $threadsperchild = '25',
56-
Variant[String,Boolean] $maxrequestsperchild = '0',
57-
Optional[Variant[String,Boolean]] $maxconnectionsperchild = undef,
58-
Variant[String,Boolean] $serverlimit = '25',
59-
Optional[String] $apache_version = undef,
60-
Variant[String,Boolean] $threadlimit = '64',
61-
Variant[String,Boolean] $listenbacklog = '511',
50+
Variant[String,Integer,Boolean] $startservers = '2',
51+
Variant[String,Integer,Boolean] $maxclients = '150',
52+
Optional[Variant[String,Integer,Boolean]] $maxrequestworkers = undef,
53+
Variant[String,Integer,Boolean] $minsparethreads = '25',
54+
Variant[String,Integer,Boolean] $maxsparethreads = '75',
55+
Variant[String,Integer,Boolean] $threadsperchild = '25',
56+
Variant[String,Integer,Boolean] $maxrequestsperchild = '0',
57+
Optional[Variant[String,Integer,Boolean]] $maxconnectionsperchild = undef,
58+
Variant[String,Integer,Boolean] $serverlimit = '25',
59+
Optional[String] $apache_version = undef,
60+
Variant[String,Integer,Boolean] $threadlimit = '64',
61+
Variant[String,Integer,Boolean] $listenbacklog = '511',
6262
) {
6363
include apache
6464

‎manifests/mod/itk.pp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
# @see http://mpm-itk.sesse.net for additional documentation.
3131
# @note Unsupported platforms: CentOS: 8; RedHat: 8; SLES: all
3232
class apache::mod::itk (
33-
String $startservers = '8',
34-
String $minspareservers = '5',
35-
String $maxspareservers = '20',
36-
String $serverlimit = '256',
37-
String $maxclients = '256',
38-
String $maxrequestsperchild = '4000',
33+
Variant[String,Integer] $startservers = '8',
34+
Variant[String,Integer] $minspareservers = '5',
35+
Variant[String,Integer] $maxspareservers = '20',
36+
Variant[String,Integer] $serverlimit = '256',
37+
Variant[String,Integer] $maxclients = '256',
38+
Variant[String,Integer] $maxrequestsperchild = '4000',
3939
Optional[Variant[Boolean,String]] $enablecapabilities = undef,
4040
Optional[String] $apache_version = undef,
4141
) {

‎manifests/mod/pagespeed.pp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -168,21 +168,21 @@
168168
Array $forbid_filters = [],
169169
Integer $rewrite_deadline_per_flush_ms = 10,
170170
Optional[String] $additional_domains = undef,
171-
Integer$file_cache_size_kb = 102400,
172-
Integer$file_cache_clean_interval_ms = 3600000,
173-
Integer$lru_cache_per_process = 1024,
174-
Integer$lru_cache_byte_limit = 16384,
175-
Integer$css_flatten_max_bytes = 2048,
176-
Integer$css_inline_max_bytes = 2048,
177-
Integer$css_image_inline_max_bytes = 2048,
178-
Integer$image_inline_max_bytes = 2048,
179-
Integer$js_inline_max_bytes = 2048,
180-
Integer$css_outline_min_bytes = 3000,
181-
Integer$js_outline_min_bytes = 3000,
182-
Integer$inode_limit = 500000,
183-
Integer$image_max_rewrites_at_once = 8,
184-
Integer$num_rewrite_threads = 4,
185-
Integer$num_expensive_rewrite_threads = 4,
171+
Integer $file_cache_size_kb = 102400,
172+
Integer $file_cache_clean_interval_ms = 3600000,
173+
Integer $lru_cache_per_process = 1024,
174+
Integer $lru_cache_byte_limit = 16384,
175+
Integer $css_flatten_max_bytes = 2048,
176+
Integer $css_inline_max_bytes = 2048,
177+
Integer $css_image_inline_max_bytes = 2048,
178+
Integer $image_inline_max_bytes = 2048,
179+
Integer $js_inline_max_bytes = 2048,
180+
Integer $css_outline_min_bytes = 3000,
181+
Integer $js_outline_min_bytes = 3000,
182+
Integer $inode_limit = 500000,
183+
Integer $image_max_rewrites_at_once = 8,
184+
Integer $num_rewrite_threads = 4,
185+
Integer $num_expensive_rewrite_threads = 4,
186186
String $collect_statistics = 'on',
187187
String $statistics_logging = 'on',
188188
Array $allow_view_stats = [],

‎manifests/mod/prefork.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
Variant[Integer,String] $maxrequestsperchild = '4000',
4444
Optional[Variant[Integer,String]] $maxconnectionsperchild = undef,
4545
Optional[String] $apache_version = undef,
46-
String $listenbacklog = '511'
46+
Variant[String,Integer] $listenbacklog = '511'
4747
) {
4848
include apache
4949
$_apache_version = pick($apache_version, $apache::apache_version)

‎manifests/mod/security.pp‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -94,36 +94,36 @@
9494
# @see https://github.com/SpiderLabs/ModSecurity/wiki for additional documentation.
9595
#
9696
class apache::mod::security (
97-
String $logroot = $apache::params::logroot,
98-
Integer $version = $apache::params::modsec_version,
99-
Optional[String] $crs_package = $apache::params::modsec_crs_package,
100-
Array[String] $activated_rules = $apache::params::modsec_default_rules,
101-
Boolean $custom_rules = $apache::params::modsec_custom_rules,
102-
Optional[Array[String]] $custom_rules_set = $apache::params::modsec_custom_rules_set,
103-
String $modsec_dir = $apache::params::modsec_dir,
104-
String $modsec_secruleengine = $apache::params::modsec_secruleengine,
105-
String $audit_log_relevant_status = '^(?:5|4(?!04))',
106-
String $audit_log_parts = $apache::params::modsec_audit_log_parts,
107-
String $audit_log_type = $apache::params::modsec_audit_log_type,
108-
Optional[String] $audit_log_storage_dir = undef,
109-
Integer $secpcrematchlimit = $apache::params::secpcrematchlimit,
110-
Integer $secpcrematchlimitrecursion = $apache::params::secpcrematchlimitrecursion,
111-
String $allowed_methods = 'GET HEAD POST OPTIONS',
112-
String $content_types = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
113-
String $restricted_extensions = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
114-
String $restricted_headers = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
115-
String $secdefaultaction = 'deny',
116-
String $inbound_anomaly_threshold = '5',
117-
String $outbound_anomaly_threshold = '4',
118-
String $critical_anomaly_score = '5',
119-
String $error_anomaly_score = '4',
120-
String $warning_anomaly_score = '3',
121-
String $notice_anomaly_score = '2',
122-
String $secrequestmaxnumargs = '255',
123-
String $secrequestbodylimit = '13107200',
124-
String $secrequestbodynofileslimit = '131072',
125-
String $secrequestbodyinmemorylimit = '131072',
126-
Boolean $manage_security_crs = true,
97+
String $logroot = $apache::params::logroot,
98+
Integer $version = $apache::params::modsec_version,
99+
Optional[String] $crs_package = $apache::params::modsec_crs_package,
100+
Array[String] $activated_rules = $apache::params::modsec_default_rules,
101+
Boolean $custom_rules = $apache::params::modsec_custom_rules,
102+
Optional[Array[String]] $custom_rules_set = $apache::params::modsec_custom_rules_set,
103+
String $modsec_dir = $apache::params::modsec_dir,
104+
String $modsec_secruleengine = $apache::params::modsec_secruleengine,
105+
String $audit_log_relevant_status = '^(?:5|4(?!04))',
106+
String $audit_log_parts = $apache::params::modsec_audit_log_parts,
107+
String $audit_log_type = $apache::params::modsec_audit_log_type,
108+
Optional[String] $audit_log_storage_dir = undef,
109+
Integer $secpcrematchlimit = $apache::params::secpcrematchlimit,
110+
Integer $secpcrematchlimitrecursion = $apache::params::secpcrematchlimitrecursion,
111+
String $allowed_methods = 'GET HEAD POST OPTIONS',
112+
String $content_types = 'application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf',
113+
String $restricted_extensions = '.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/',
114+
String $restricted_headers = '/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/',
115+
String $secdefaultaction = 'deny',
116+
Variant[String,Integer] $inbound_anomaly_threshold = '5',
117+
Variant[String,Integer] $outbound_anomaly_threshold = '4',
118+
Variant[String,Integer] $critical_anomaly_score = '5',
119+
Variant[String,Integer] $error_anomaly_score = '4',
120+
Variant[String,Integer] $warning_anomaly_score = '3',
121+
Variant[String,Integer] $notice_anomaly_score = '2',
122+
Variant[String,Integer] $secrequestmaxnumargs = '255',
123+
Variant[String,Integer] $secrequestbodylimit = '13107200',
124+
Variant[String,Integer] $secrequestbodynofileslimit = '131072',
125+
Variant[String,Integer] $secrequestbodyinmemorylimit = '131072',
126+
Boolean $manage_security_crs = true,
127127
) inherits apache::params {
128128
include apache
129129

‎manifests/vhost/custom.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#
1818
define apache::vhost::custom (
1919
String $content,
20-
String $ensure = 'present',
21-
Variant[Integer,String] $priority = '25',
22-
Boolean $verify_config = true,
20+
String $ensure = 'present',
21+
Variant[Integer,String,Boolean] $priority = '25',
22+
Boolean $verify_config = true,
2323
) {
2424
include apache
2525

0 commit comments

Comments
 (0)