Skip to content

Commit 029d9cf

Browse files
committed
Revert rack and webrick changes — superseded by OpenVoxProject#140
PR OpenVoxProject#140 deletes these files entirely; our edits are no longer needed. Signed-off-by: Michael Harp <mike@mikeharp.com>
1 parent df40318 commit 029d9cf

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

docs/_openvox_8x/services_master_rack.markdown

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ title: "Puppet's services: The Rack Puppet master"
88
[passenger_guide]: ./passenger.html
99
[passenger]: http://www.modrails.com/
1010
[external_ca]: ./config_ssl_external_ca.html
11-
[client authentication]: /docs/background/ssl/tls_ssl.html
12-
[subject dn]: /docs/background/ssl/cert_anatomy.html#the-subject-dn-cn-certname-etc
13-
[pem format]: /docs/background/ssl/cert_anatomy.html#pem-file
11+
[client authentication]: /background/ssl/tls_ssl.html
12+
[subject dn]: /background/ssl/cert_anatomy.html#the-subject-dn-cn-certname-etc
13+
[pem format]: /background/ssl/cert_anatomy.html#pem-file
1414
[trusted]: ./lang_facts_and_builtin_vars.html#trusted-facts
1515
[webrick]: ./services_master_webrick.html
1616
[puppet server]: /openvox-server/latest/services_master_puppetserver.html
@@ -30,6 +30,8 @@ A Rack server is one of two recommended ways to run the Puppet master service; t
3030
3131
This page describes the generic requirements and run environment for running under Rack; for practical configuration instructions, see [the guide to configuring a Passenger + Apache Puppet master.][passenger_guide]
3232

33+
For details about invoking the Puppet master command, see [the puppet master man page](./man/master.html).
34+
3335
## Supported platforms
3436

3537
The Rack Puppet master will run on any \*nix platform, including all Linux variants and OS X. It requires a **multi-process** (_not_ threaded) Rack web server.
@@ -148,7 +150,7 @@ Your SSL termination must be configured as follows:
148150
* It should pass on the entire client certificate, if the connection was verified. This information should eventually reach the Puppet master.
149151

150152

151-
[ssl_persist]: /docs/background/ssl/https.html#persistence-of-sslcertificate-data-in-https-applications
153+
[ssl_persist]: /background/ssl/https.html#persistence-of-sslcertificate-data-in-https-applications
152154

153155
### Required environment variables/headers
154156

docs/_openvox_8x/services_master_webrick.markdown

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Puppet has the built-in capability to run a complete Puppet master server using
1717

1818
The WEBrick Puppet master server is not capable of handling production-level numbers of agent nodes. Since it can't handle concurrent connections, it will be quickly overwhelmed by as few as 10 agents. You should never run a WEBrick Puppet master in production, and should always configure a [Rack Puppet master server][rack_master] instead.
1919

20+
For details about invoking the Puppet master command, see [the puppet master man page](./man/master.html).
21+
2022
## Supported platforms
2123

2224
The WEBrick Puppet master will run on any \*nix platform, including all Linux variants and OS X.

0 commit comments

Comments
 (0)