Skip to content

Commit 7867fb6

Browse files
authored
Merge pull request #185 from OpenVoxProject/tk-webserver
Update links to latest trapperkeeper-webserver repo
2 parents f663a44 + 87501c3 commit 7867fb6

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

docs/_openvox-server_8x/config_file_webserver.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ webserver: {
2626
```
2727

2828
These are the main values for managing a Puppet Server installation. For further documentation, including a complete list of available settings and values, see
29-
[Configuring the Webserver Service](https://github.com/puppetlabs/trapperkeeper-webserver-jetty9/blob/master/doc/jetty-config.md).
29+
[Configuring the Webserver Service](https://github.com/openvoxproject/trapperkeeper-webserver/blob/main/doc/jetty-config.md).
3030

3131
By default, Puppet Server is configured to use the correct Puppet master and certificate authority (CA) certificates. If you're using an external CA and providing your own certificates and keys, make sure the
3232
SSL-related parameters in `webserver.conf` point to the correct file.

docs/_openvox-server_8x/configuration.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ By default, the following information is logged for each HTTP request:
9292
- elapsed time to serve the request, in milliseconds
9393

9494
The Logback configuration file is at `/etc/puppetlabs/puppetserver/request-logging.xml`. You can edit this file to change the logging behavior. Specify a different Logback configuration file in
95-
[`webserver.conf`](./config_file_webserver.html) with the [`access-log-config`](https://github.com/puppetlabs/trapperkeeper-webserver-jetty9/blob/master/doc/jetty-config.md#access-log-config) setting. For
95+
[`webserver.conf`](./config_file_webserver.html) with the [`access-log-config`](https://github.com/openvoxproject/trapperkeeper-webserver/blob/main/doc/jetty-config.md#access-log-config) setting. For
9696
more information on configuring the logged data, see [Logback Access Pattern Layout](http://logback.qos.ch/manual/layouts.html#AccessPatternLayout).
9797

9898
### Authorization

docs/_openvox-server_8x/external_ssl_termination.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Use the following steps to configure external SSL termination.
99
## Disable HTTPS for Puppet Server
1010

1111
You'll need to turn off SSL and have Puppet Server use the HTTP protocol instead: remove the `ssl-port` and `ssl-host` settings from the `conf.d/webserver.conf` file and replace them with `port` and `host`
12-
settings. See [Configuring the Webserver Service](https://github.com/puppetlabs/trapperkeeper-webserver-jetty9/blob/master/doc/jetty-config.md) for more information on configuring the web server service.
12+
settings. See [Configuring the Webserver Service](https://github.com/openvoxproject/trapperkeeper-webserver/blob/main/doc/jetty-config.md) for more information on configuring the web server service.
1313

1414
## Allow Client Cert Data From HTTP Headers
1515

docs/_openvox-server_8x/status-api/v1/services.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,4 @@ Requests to the `services` endpoint are authorized by the [Trapperkeeper-based a
102102
processes and configuration settings, see the [`auth.conf` documentation][`auth.conf`].
103103

104104
One may also restrict access to the status service by changing the `client-auth` setting to `required` for the webserver. See
105-
[Configuring the Webserver Service](https://github.com/puppetlabs/trapperkeeper-webserver-jetty9/blob/master/doc/jetty-config.md#client-auth) for more information on the `client-auth` setting.
105+
[Configuring the Webserver Service](https://github.com/openvoxproject/trapperkeeper-webserver/blob/main/doc/jetty-config.md#client-auth) for more information on the `client-auth` setting.

docs/_openvox-server_8x/status-api/v1/simple.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,5 @@ authorization processes and configuration settings, see the
6666

6767
One may also restrict access to the status service by changing the
6868
`client-auth` setting to `required` for the webserver. See
69-
[Configuring the Webserver Service](https://github.com/puppetlabs/trapperkeeper-webserver-jetty9/blob/master/doc/jetty-config.md#client-auth)
69+
[Configuring the Webserver Service](https://github.com/openvoxproject/trapperkeeper-webserver/blob/main/doc/jetty-config.md#client-auth)
7070
for more information on the `client-auth` setting.

docs/_openvox-server_8x/subcommands.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,6 @@ $ puppetserver foreground --debug
209209
2014-10-25 18:04:22,158 DEBUG [main] [p.t.logging] Debug logging enabled
210210
2014-10-25 18:04:22,160 DEBUG [main] [p.t.bootstrap] Loading bootstrap config from specified path: '/etc/puppetserver/bootstrap.cfg'
211211
2014-10-25 18:04:26,097 INFO [main] [p.s.j.jruby-puppet-service] Initializing the JRuby service
212-
2014-10-25 18:04:26,101 INFO [main] [p.t.s.w.jetty9-service] Initializing web server(s).
212+
2014-10-25 18:04:26,101 INFO [main] [p.t.s.w.jetty-service] Initializing web server(s).
213213
2014-10-25 18:04:26,149 DEBUG [clojure-agent-send-pool-0] [p.s.j.jruby-puppet-agents] Initializing JRubyPuppet instances with the following settings:
214214
```

0 commit comments

Comments
 (0)