Skip to content

Commit 9c786f0

Browse files
authored
Merge pull request #380 from miharp/docs/remove-rack-references-275
Remove obsolete 'Rack application' / Passenger / WEBrick deployment references
2 parents f9a01e6 + 9d5baee commit 9c786f0

6 files changed

Lines changed: 3 additions & 9 deletions

File tree

docs/_openvox_8x/config_important_settings.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ These settings should usually go in `[server]`. However, if you're using Puppet
125125
### Basics
126126

127127
* [`dns_alt_names`][dns_alt_names] --- A list of hostnames the server is allowed to use when acting as an OpenVox Server. The hostname your agents use in their `server` setting **must** be included in either this setting or the master's `certname` setting. Note that this setting is only used when initially generating the OpenVox Server's certificate --- if you need to change the DNS names, you must:
128-
1. Turn off the Puppet server service (or your Rack server).
128+
1. Turn off the Puppet server service.
129129
2. Run `sudo puppetserver ca clean --certname <SERVER'S CERTNAME>`.
130130
3. Run `sudo puppetserver ca generate --certname <SERVER'S CERTNAME> --subject-alt-names <ALT NAME 1>,<ALT NAME 2>,...`.
131131
4. Re-start the Puppet server service.

docs/_openvox_8x/config_print.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ To see the settings the OpenVox Server service would use:
7878
* Specify `--section server`.
7979
* Use the `--environment` option to specify the environment you want settings for, or let it default to `production`.
8080
* Remember to use `sudo`.
81-
* If your OpenVox Server is managed as a rack application (e.g. with Passenger), check the `config.ru` file to make sure it's using the [confdir][] and [vardir][] that you expect. If it's using non-standard ones, you will need to specify them on the command line with the `--confdir` and `--vardir` options; otherwise you might not see the correct values for settings.
81+
* If your OpenVox Server uses a non-standard [confdir][] or [vardir][], specify them on the command line with the `--confdir` and `--vardir` options; otherwise you might not see the correct values for settings.
8282

8383
### Examples
8484

docs/_openvox_8x/dirs_codedir.markdown

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ When Puppet is running as either root, a Windows user with administrator privile
2020

2121
The system codedir is what you usually want to use, since you will usually run Puppet's commands and services as root or `puppet`. (Note that admin commands like `puppet module` must be run with `sudo` to use the same codedir as OpenVox agent or OpenVox Server.)
2222

23-
> **Note:** When OpenVox Server is running as a Rack application, the `config.ru` file must explicitly set `--codedir` to the system codedir. The example `config.ru` file provided with the Puppet source does this.
24-
2523
### Configuration
2624

2725
The location of the codedir can be configured in puppet.conf with [the `codedir` setting][codedir], but note that Puppet Server doesn't use that setting; it has its own `jruby-puppet.master-code-dir` setting [in puppetserver.conf][puppetserver_conf]. If you're using a non-default codedir, _you must change both settings._

docs/_openvox_8x/dirs_confdir.markdown

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ The system confdir is what you usually want to use, since you will usually run P
2121
services as root or `puppet`. (Note that admin commands like `puppetserver ca` must be run with `sudo`
2222
to use the same confdir as OpenVox agent or OpenVox Server.)
2323

24-
> **Note:** When OpenVox Server is running as a Rack application, the `config.ru` file must explicitly set `--confdir` to the system confdir. The example `config.ru` file provided with the Puppet source does this.
25-
2624
### Configuration
2725

2826
Puppet's confdir can be specified on the command line with the `--confdir` option, but it can't be set

docs/_openvox_8x/dirs_vardir.markdown

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ The system cache directory is what you usually want to use, since you will usual
2424
and services as root or `puppet`. (Note that admin commands like `puppetserver ca` must be run with
2525
`sudo` to use the same directories as OpenVox agent or OpenVox Server.)
2626

27-
> **Note:** When OpenVox Server is running as a Rack application, the `config.ru` file must explicitly set `--vardir` to the system cache directory. The example `config.ru` file provided with the Puppet source does this.
28-
2927
### Configuring the location of the cache directory
3028

3129
You can specify Puppet's cache directory on the command line by using the `--vardir` option, but you can't set it in `puppet.conf`. If `--vardir` isn't specified when a Puppet application is started, it will always use the default cache directory location.

docs/_openvox_8x/static_catalogs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ The script's standard output becomes the file's `code_content`, provided the scr
117117
Starting in Puppet 4.4 and OpenVox Server 2.3.0, the global `static_catalogs` setting is enabled by default, whether you upgrade Puppet or perform a clean installation.
118118
However, the default configuration doesn't include the `code-id-command` and `code-content-command` scripts or settings needed to produce static catalogs, and even when configured to produce static catalogs OpenVox Server doesn't inline metadata for all types of file resources.
119119

120-
Static catalogs are produced only by OpenVox Server. The Ruby OpenVox server never produces static catalogs, even when served by WEBrick or Passenger.
120+
Static catalogs are produced only by OpenVox Server.
121121

122122
OpenVox Server also won't produce static catalogs for an agent under the following circumstances:
123123

0 commit comments

Comments
 (0)