Skip to content

Narrow down Datatypes #2245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
--relative
--no-anchor_resource-check
--no-140chars-check
1 change: 1 addition & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ changelog_since_tag: "3.2.0"
Rakefile:
extra_disabled_lint_checks:
- anchor_resource
- 140chars
56 changes: 28 additions & 28 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ When you declare this class with the default options, the module:

- Installs the appropriate Apache software package and [required Apache modules][`default_mods`] for your operating system.
- Places the required configuration files in a directory, with the [default location][`conf_dir`] Depends on operating system.
- Configures the server with a default virtual host and standard port ('80') and address ('\*') bindings.
- Configures the server with a default virtual host and standard port (80) and address ('\*') bindings.
- Creates a document root directory Depends on operating system, typically `/var/www`.
- Starts the Apache service.

Expand Down Expand Up @@ -345,7 +345,7 @@ To configure basic [name-based virtual hosts][], specify the [`port`][] and [`do

``` puppet
apache::vhost { 'vhost.example.com':
port => '80',
port => 80,
docroot => '/var/www/vhost',
}
```
Expand All @@ -358,7 +358,7 @@ To configure user and group ownership for `docroot`, use the [`docroot_owner`][]

``` puppet
apache::vhost { 'user.example.com':
port => '80',
port => 80,
docroot => '/var/www/user',
docroot_owner => 'www-data',
docroot_group => 'www-data',
Expand All @@ -367,11 +367,11 @@ apache::vhost { 'user.example.com':

#### Configuring virtual hosts with SSL

To configure a virtual host to use [SSL encryption][] and default SSL certificates, set the [`ssl`][] parameter. You must also specify the [`port`][] parameter, typically with a value of '443', to accommodate HTTPS requests:
To configure a virtual host to use [SSL encryption][] and default SSL certificates, set the [`ssl`][] parameter. You must also specify the [`port`][] parameter, typically with a value of 443, to accommodate HTTPS requests:

``` puppet
apache::vhost { 'ssl.example.com':
port => '443',
port => 443,
docroot => '/var/www/ssl',
ssl => true,
}
Expand All @@ -381,7 +381,7 @@ To configure a virtual host to use SSL and specific SSL certificates, use the pa

``` puppet
apache::vhost { 'cert.example.com':
port => '443',
port => 443,
docroot => '/var/www/cert',
ssl => true,
ssl_cert => '/etc/ssl/fourth.example.com.cert',
Expand All @@ -395,14 +395,14 @@ To configure a mix of SSL and unencrypted virtual hosts at the same domain, decl
# The non-ssl virtual host
apache::vhost { 'mix.example.com non-ssl':
servername => 'mix.example.com',
port => '80',
port => 80,
docroot => '/var/www/mix',
}

# The SSL virtual host at the same domain
apache::vhost { 'mix.example.com ssl':
servername => 'mix.example.com',
port => '443',
port => 443,
docroot => '/var/www/mix',
ssl => true,
}
Expand All @@ -413,15 +413,15 @@ To configure a virtual host to redirect unencrypted connections to SSL, declare
``` puppet
apache::vhost { 'redirect.example.com non-ssl':
servername => 'redirect.example.com',
port => '80',
port => 80,
docroot => '/var/www/redirect',
redirect_status => 'permanent',
redirect_dest => 'https://redirect.example.com/'
}

apache::vhost { 'redirect.example.com ssl':
servername => 'redirect.example.com',
port => '443',
port => 443,
docroot => '/var/www/redirect',
ssl => true,
}
Expand All @@ -434,7 +434,7 @@ Virtual hosts listen on all IP addresses ('\*') by default. To configure the vir
``` puppet
apache::vhost { 'ip.example.com':
ip => '127.0.0.1',
port => '80',
port => 80,
docroot => '/var/www/ip',
}
```
Expand All @@ -444,7 +444,7 @@ You can also configure more than one IP address per virtual host by using an arr
``` puppet
apache::vhost { 'ip.example.com':
ip => ['127.0.0.1','169.254.1.1'],
port => '80',
port => 80,
docroot => '/var/www/ip',
}
```
Expand All @@ -454,7 +454,7 @@ You can configure multiple ports per virtual host by using an array of ports for
``` puppet
apache::vhost { 'ip.example.com':
ip => ['127.0.0.1'],
port => ['80','8080']
port => [80, 8080]
docroot => '/var/www/ip',
}
```
Expand All @@ -467,7 +467,7 @@ apache::vhost { 'aliases.example.com':
'aliases.example.org',
'aliases.example.net',
],
port => '80',
port => 80,
docroot => '/var/www/aliases',
}
```
Expand All @@ -477,7 +477,7 @@ To set up a virtual host with a wildcard alias for the subdomain mapped to a dir
``` puppet
apache::vhost { 'subdomain.loc':
vhost_name => '*',
port => '80',
port => 80,
virtual_docroot => '/var/www/%-2+',
docroot => '/var/www',
serveraliases => ['*.loc',],
Expand All @@ -488,7 +488,7 @@ To configure a virtual host with [filter rules][], pass the filter directives as

``` puppet
apache::vhost { 'subdomain.loc':
port => '80',
port => 80,
filters => [
'FilterDeclare COMPRESS',
'FilterProvider COMPRESS DEFLATE resp=Content-Type $text/html',
Expand All @@ -505,13 +505,13 @@ To configure a virtual host to use the [Web Server Gateway Interface][] (WSGI) f

``` puppet
apache::vhost { 'wsgi.example.com':
port => '80',
port => 80,
docroot => '/var/www/pythonapp',
wsgi_application_group => '%{GLOBAL}',
wsgi_daemon_process => 'wsgi',
wsgi_daemon_process_options => {
processes => '2',
threads => '15',
processes => 2,
threads => 15,
display-name => '%{GROUP}',
},
wsgi_import_script => '/var/www/demo.wsgi',
Expand All @@ -528,7 +528,7 @@ As of Apache 2.2.16, Apache supports [FallbackResource][], a simple replacement

``` puppet
apache::vhost { 'wordpress.example.com':
port => '80',
port => 80,
docroot => '/var/www/wordpress',
fallbackresource => '/index.php',
}
Expand All @@ -540,7 +540,7 @@ To configure a virtual host with a designated directory for [Common Gateway Inte

``` puppet
apache::vhost { 'cgi.example.com':
port => '80',
port => 80,
docroot => '/var/www/cgi',
scriptalias => '/usr/lib/cgi-bin',
}
Expand All @@ -550,7 +550,7 @@ To configure a virtual host for [Rack][], use the [`rack_base_uri`][] parameter:

``` puppet
apache::vhost { 'rack.example.com':
port => '80',
port => 80,
docroot => '/var/www/rack',
rack_base_uri => ['/rackapp1', '/rackapp2'],
}
Expand Down Expand Up @@ -590,15 +590,15 @@ In this example, we add two IP-based virtual hosts on an IP address (in this exa
apache::vhost { 'The first IP-based virtual host, non-ssl':
servername => 'first.example.com',
ip => '10.0.0.10',
port => '80',
port => 80,
ip_based => true,
docroot => '/var/www/first',
}

apache::vhost { 'The first IP-based vhost, ssl':
servername => 'first.example.com',
ip => '10.0.0.10',
port => '443',
port => 443,
ip_based => true,
docroot => '/var/www/first-ssl',
ssl => true,
Expand All @@ -610,13 +610,13 @@ Next, we add two name-based virtual hosts listening on a second IP address (10.0
``` puppet
apache::vhost { 'second.example.com':
ip => '10.0.0.20',
port => '80',
port => 80,
docroot => '/var/www/second',
}

apache::vhost { 'third.example.com':
ip => '10.0.0.20',
port => '80',
port => 80,
docroot => '/var/www/third',
}
```
Expand All @@ -625,13 +625,13 @@ To add name-based virtual hosts that answer on either 10.0.0.10 or 10.0.0.20, yo

``` puppet
apache::vhost { 'fourth.example.com':
port => '80',
port => 80,
docroot => '/var/www/fourth',
add_listen => false,
}

apache::vhost { 'fifth.example.com':
port => '80',
port => 80,
docroot => '/var/www/fifth',
add_listen => false,
}
Expand Down
Loading