Skip to content

Commit 84940ea

Browse files
committed
Drop mod_fastcgi support
mod_fastcgi isn't part of EL7 and beyond, nor in any current Debian release. That's because upstream is dead. It also isn't part of RHEL itself and EPEL 6 is dead. Removing it from the codebase simplifies it.
1 parent 950cffb commit 84940ea

File tree

9 files changed

+0
-325
lines changed

9 files changed

+0
-325
lines changed

README.md

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
[Installing Apache modules]: #installing-apache-modules
1515
[Installing arbitrary modules]: #installing-arbitrary-modules
1616
[Installing specific modules]: #installing-specific-modules
17-
[Configuring FastCGI servers]: #configuring-fastcgi-servers-to-handle-php-files
1817
[Load balancing examples]: #load-balancing-examples
1918
[apache affects]: #what-the-apache-module-affects
2019

@@ -34,7 +33,6 @@
3433
[`apache_version`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apache_version
3534
[`apache::balancer`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachebalancer
3635
[`apache::balancermember`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachebalancermember
37-
[`apache::fastcgi::server`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachefastcgiserver
3836
[`apache::mod`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemod
3937
[`apache::mod::<MODULE NAME>`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#public-classes
4038
[`apache::mod::alias`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#apachemodalias
@@ -110,7 +108,6 @@
110108
[`ExtendedStatus`]: https://httpd.apache.org/docs/current/mod/core.html#extendedstatus
111109

112110
[Facter]: http://docs.puppet.com/facter/
113-
[FastCGI]: https://fast-cgi.github.io/
114111
[FallbackResource]: https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource
115112
[`fallbackresource`]: https://forge.puppet.com/modules/puppetlabs/apache/reference#fallbackresource
116113
[`FileETag`]: https://httpd.apache.org/docs/current/mod/core.html#fileetag
@@ -272,7 +269,6 @@
272269
- [Beginning with Apache - Installation][Beginning with Apache]
273270
3. [Usage - The classes and defined types available for configuration][Usage]
274271
- [Configuring virtual hosts - Examples to help get started][Configuring virtual hosts]
275-
- [Configuring FastCGI servers to handle PHP files][Configuring FastCGI servers]
276272
- [Load balancing with exported and non-exported resources][Load balancing examples]
277273
4. [Reference - An under-the-hood peek at what the module is doing and how][Reference]
278274
5. [Limitations - OS compatibility, etc.][Limitations]
@@ -676,54 +672,6 @@ apache::mod { 'mod_authnz_external': }
676672

677673
There are several optional parameters you can specify when defining Apache modules this way. See the [defined type's reference][`apache::mod`] for details.
678674

679-
<a id="configuring-fastcgi-servers-to-handle-php-files"></a>
680-
### Configuring FastCGI servers to handle PHP files
681-
682-
#### FastCGI on Ubuntu 18.04
683-
684-
On Ubuntu 18.04, `mod_fastcgi` is no longer supported. So considering:
685-
686-
* an Apache Vhost with docroot set to `/var/www/html`
687-
* a FastCGI server listening on `127.0.0.1:9000`
688-
689-
you can then use the [`custom_fragment`][] parameter to configure the virtual host to have the FastCGI server handle the specified file type:
690-
691-
``` puppet
692-
apache::vhost { 'www':
693-
...
694-
docroot => '/var/www/html/',
695-
custom_fragment => 'ProxyPassMatch ^/(.*\.php)$ fcgi://127.0.0.1:9000/var/www/html/$1',
696-
...
697-
}
698-
```
699-
700-
Please note you have to adjust the second ProxyPassMatch parameter to your docroot value (here `/var/www/html/`).
701-
702-
#### Other OSes
703-
704-
Add the [`apache::fastcgi::server`][] defined type to allow [FastCGI][] servers to handle requests for specific files. For example, the following defines a FastCGI server at 127.0.0.1 (localhost) on port 9000 to handle PHP requests:
705-
706-
``` puppet
707-
apache::fastcgi::server { 'php':
708-
host => '127.0.0.1:9000',
709-
timeout => 15,
710-
flush => false,
711-
faux_path => '/var/www/php.fcgi',
712-
fcgi_alias => '/php.fcgi',
713-
file_type => 'application/x-httpd-php'
714-
}
715-
```
716-
717-
You can then use the [`custom_fragment`][] parameter to configure the virtual host to have the FastCGI server handle the specified file type:
718-
719-
``` puppet
720-
apache::vhost { 'www':
721-
...
722-
custom_fragment => 'AddType application/x-httpd-php .php'
723-
...
724-
}
725-
```
726-
727675
<a id="load-balancing-examples"></a>
728676
### Load balancing examples
729677

manifests/mod/fastcgi.pp

Lines changed: 0 additions & 35 deletions
This file was deleted.

manifests/params.pp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
$keepalive = 'On'
104104
$keepalive_timeout = 15
105105
$max_keepalive_requests = 100
106-
$fastcgi_lib_path = undef
107106
$mime_support_package = 'mailcap'
108107
$mime_types_config = '/etc/mime.types'
109108
$docroot = "${httpd_root}/var/www/html"
@@ -214,11 +213,6 @@
214213
default => 'mod_ldap',
215214
},
216215
'authnz_pam' => 'mod_authnz_pam',
217-
'fastcgi' => $facts['os']['release']['major'] ? {
218-
'5' => 'mod_fastcgi',
219-
'6' => 'mod_fastcgi',
220-
default => undef,
221-
},
222216
'fcgid' => 'mod_fcgid',
223217
'geoip' => 'mod_geoip',
224218
'intercept_form_submit' => 'mod_intercept_form_submit',
@@ -272,7 +266,6 @@
272266
$keepalive = 'On'
273267
$keepalive_timeout = 15
274268
$max_keepalive_requests = 100
275-
$fastcgi_lib_path = undef
276269
$mime_support_package = 'mailcap'
277270
$mime_types_config = '/etc/mime.types'
278271
$docroot = '/var/www/html'
@@ -368,7 +361,6 @@
368361
'auth_mellon' => 'libapache2-mod-auth-mellon',
369362
'authnz_pam' => 'libapache2-mod-authnz-pam',
370363
'dav_svn' => 'libapache2-mod-svn',
371-
'fastcgi' => 'libapache2-mod-fastcgi',
372364
'fcgid' => 'libapache2-mod-fcgid',
373365
'geoip' => 'libapache2-mod-geoip',
374366
'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
@@ -399,7 +391,6 @@
399391
'auth_mellon' => 'libapache2-mod-auth-mellon',
400392
'authnz_pam' => 'libapache2-mod-authnz-pam',
401393
'dav_svn' => 'libapache2-mod-svn',
402-
'fastcgi' => 'libapache2-mod-fastcgi',
403394
'fcgid' => 'libapache2-mod-fcgid',
404395
'geoip' => 'libapache2-mod-geoip',
405396
'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
@@ -435,7 +426,6 @@
435426
$keepalive = 'On'
436427
$keepalive_timeout = 15
437428
$max_keepalive_requests = 100
438-
$fastcgi_lib_path = '/var/lib/apache2/fastcgi'
439429
$mime_support_package = 'mime-support'
440430
$mime_types_config = '/etc/mime.types'
441431
$docroot = '/var/www/html'
@@ -546,7 +536,6 @@
546536
$keepalive = 'On'
547537
$keepalive_timeout = 15
548538
$max_keepalive_requests = 100
549-
$fastcgi_lib_path = undef # TODO: revisit
550539
$mime_support_package = 'misc/mime-support'
551540
$mime_types_config = '/usr/local/etc/mime.types'
552541
$wsgi_socket_prefix = undef
@@ -613,7 +602,6 @@
613602
$keepalive = 'On'
614603
$keepalive_timeout = 15
615604
$max_keepalive_requests = 100
616-
$fastcgi_lib_path = undef # TODO: revisit
617605
$mime_support_package = 'app-misc/mime-types'
618606
$mime_types_config = '/etc/mime.types'
619607
$wsgi_socket_prefix = undef
@@ -689,7 +677,6 @@
689677
$keepalive = 'On'
690678
$keepalive_timeout = 15
691679
$max_keepalive_requests = 100
692-
$fastcgi_lib_path = '/var/lib/apache2/fastcgi'
693680
$mime_support_package = 'aaa_base'
694681
$mime_types_config = '/etc/mime.types'
695682
$docroot = '/srv/www'

manifests/vhost.pp

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -252,18 +252,6 @@
252252
# your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Values must either begin
253253
# with a `/` or be `disabled`.
254254
#
255-
# @param fastcgi_server
256-
# Specify an external FastCGI server to manage a connection to.
257-
#
258-
# @param fastcgi_socket
259-
# Specify the socket that will be used to communicate with an external FastCGI server.
260-
#
261-
# @param fastcgi_idle_timeout
262-
# If using fastcgi, this option sets the timeout for the server to respond.
263-
#
264-
# @param fastcgi_dir
265-
# Specify an internal FastCGI directory that is to be managed.
266-
#
267255
# @param filters
268256
# [Filters](https://httpd.apache.org/docs/current/mod/mod_filter.html) enable smart,
269257
# context-sensitive configuration of output content filters.
@@ -1838,10 +1826,6 @@
18381826
Optional[String] $custom_fragment = undef,
18391827
Optional[Hash] $itk = undef,
18401828
Optional[String] $action = undef,
1841-
Optional[String] $fastcgi_server = undef,
1842-
Optional[String] $fastcgi_socket = undef,
1843-
Optional[String] $fastcgi_dir = undef,
1844-
Optional[Integer] $fastcgi_idle_timeout = undef,
18451829
Variant[Array[String], String] $additional_includes = [],
18461830
Boolean $use_optional_includes = $apache::use_optional_includes,
18471831
Optional[String] $apache_version = $apache::apache_version,
@@ -2691,22 +2675,6 @@
26912675
}
26922676
}
26932677

2694-
# Template uses:
2695-
# - $fastcgi_server
2696-
# - $fastcgi_socket
2697-
# - $fastcgi_dir
2698-
# - $fastcgi_idle_timeout
2699-
# - $apache_version
2700-
if ($fastcgi_server or $fastcgi_dir) and $ensure == 'present' {
2701-
include apache::mod::fastcgi
2702-
2703-
concat::fragment { "${name}-fastcgi":
2704-
target => "${priority_real}${filename}.conf",
2705-
order => 280,
2706-
content => template('apache/vhost/_fastcgi.erb'),
2707-
}
2708-
}
2709-
27102678
# Template uses:
27112679
# - $suexec_user_group
27122680
if $suexec_user_group and $ensure == 'present' {

spec/classes/mod/fastcgi_spec.rb

Lines changed: 0 additions & 42 deletions
This file was deleted.

spec/defines/fastcgi_server_spec.rb

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)