|
2 | 2 |
|
3 | 3 | `octocatalog-diff` may require configuration to work correctly with your Puppet setup.
|
4 | 4 |
|
5 |
| -0. Download the [sample configuration file](https://raw.githubusercontent.com/github/octocatalog-diff/master/examples/octocatalog-diff.cfg.rb) and save it into one of the following directories. |
| 5 | +1. Download the [sample configuration file](https://raw.githubusercontent.com/github/octocatalog-diff/master/examples/octocatalog-diff.cfg.rb) and save it into one of the following directories. |
6 | 6 |
|
7 |
| - - In the base directory of your Puppet repository checkout (i.e., your current working directory): |
| 7 | + - In the base directory of your Puppet repository checkout (i.e., your current working directory): |
8 | 8 |
|
9 |
| - ``` |
10 |
| - .octocatalog-diff.cfg.rb |
11 |
| - ``` |
| 9 | + ``` |
| 10 | + .octocatalog-diff.cfg.rb |
| 11 | + ``` |
12 | 12 |
|
13 |
| - - In your home directory: |
| 13 | + - In your home directory: |
14 | 14 |
|
15 |
| - ``` |
16 |
| - $HOME/.octocatalog-diff.cfg.rb |
17 |
| - ``` |
| 15 | + ``` |
| 16 | + $HOME/.octocatalog-diff.cfg.rb |
| 17 | + ``` |
18 | 18 |
|
19 |
| - - In one of the following system locations: |
| 19 | + - In one of the following system locations: |
20 | 20 |
|
21 |
| - ``` |
22 |
| - /usr/local/etc/octocatalog-diff.cfg.rb |
23 |
| - /opt/puppetlabs/octocatalog-diff/octocatalog-diff.cfg.rb |
24 |
| - /etc/octocatalog-diff.cfg.rb |
25 |
| - ``` |
| 21 | + ``` |
| 22 | + /usr/local/etc/octocatalog-diff.cfg.rb |
| 23 | + /opt/puppetlabs/octocatalog-diff/octocatalog-diff.cfg.rb |
| 24 | + /etc/octocatalog-diff.cfg.rb |
| 25 | + ``` |
26 | 26 |
|
27 |
| - Note: If more than one of the above files is present, the first one found will be used (proceeding from top to bottom in that list). If you set an environment variable `OCTOCATALOG_DIFF_CONFIG_FILE` that will supersede all of the above paths, and allow you to specify the configuration file location however you wish. |
| 27 | + Note: If more than one of the above files is present, the first one found will be used (proceeding from top to bottom in that list). If you set an environment variable `OCTOCATALOG_DIFF_CONFIG_FILE` that will supersede all of the above paths, and allow you to specify the configuration file location however you wish. |
28 | 28 |
|
29 |
| -0. Open the file in a text editor, and follow the comments within the file to guide yourself through configuration. The configuration file is pure ruby, allowing substantial flexibility in the configuration. |
| 29 | +1. Open the file in a text editor, and follow the comments within the file to guide yourself through configuration. The configuration file is pure ruby, allowing substantial flexibility in the configuration. |
30 | 30 |
|
31 |
| - To be minimally functional, you will almost certainly need to define at least the following settings: |
| 31 | + To be minimally functional, you will almost certainly need to define at least the following settings: |
32 | 32 |
|
33 |
| - - `settings[:hiera_config]` as the absolute or relative path to your hiera configuration file |
34 |
| - - `settings[:hiera_path_strip]` as the prefix to strip when munging the hiera configuration file |
35 |
| - - `settings[:puppetdb_url]` as the URL to your PuppetDB instance so facts can be obtained |
| 33 | + - `settings[:hiera_config]` as the absolute or relative path to your hiera configuration file |
| 34 | + - `settings[:hiera_path_strip]` as the prefix to strip when munging the hiera configuration file |
| 35 | + - `settings[:puppetdb_url]` as the URL to your PuppetDB instance so facts can be obtained |
36 | 36 |
|
37 |
| - For more information on these settings: |
| 37 | + For more information on these settings: |
38 | 38 |
|
39 |
| - - [Configuring octocatalog-diff to use Hiera](/doc/configuration-hiera.md) |
40 |
| - - [Configuring octocatalog-diff to use ENC](/doc/configuration-enc.md) |
41 |
| - - [Configuring octocatalog-diff to use PuppetDB](/doc/configuration-puppetdb.md) |
42 |
| - - [Configuring octocatalog-diff to use Puppet](/doc/configuration-puppet.md) |
| 39 | + - [Configuring octocatalog-diff to use Hiera](/doc/configuration-hiera.md) |
| 40 | + - [Configuring octocatalog-diff to use ENC](/doc/configuration-enc.md) |
| 41 | + - [Configuring octocatalog-diff to use PuppetDB](/doc/configuration-puppetdb.md) |
| 42 | + - [Configuring octocatalog-diff to use Puppet](/doc/configuration-puppet.md) |
43 | 43 |
|
44 |
| -0. Test the configuration, which will indicate the location of the configuration file and validate the contents thereof. |
| 44 | +1. Test the configuration, which will indicate the location of the configuration file and validate the contents thereof. |
45 | 45 |
|
46 |
| - ``` |
47 |
| - octocatalog-diff --config-test |
48 |
| - ``` |
| 46 | + ``` |
| 47 | + octocatalog-diff --config-test |
| 48 | + ``` |
49 | 49 |
|
50 |
| - Note: If you [installed](/doc/installation.md) octocatalog-diff as a gem, the `octocatalog-diff` binary should be in your $PATH and the above command should work correctly. If you installed in a different way, you may need to provide the full path to where the `octocatalog-diff` binary was actually installed. |
| 50 | + Note: If you [installed](/doc/installation.md) octocatalog-diff as a gem, the `octocatalog-diff` binary should be in your $PATH and the above command should work correctly. If you installed in a different way, you may need to provide the full path to where the `octocatalog-diff` binary was actually installed. |
51 | 51 |
|
52 | 52 | Now that you have entered your configuration and confirmed proper reading of your configuration file, proceed to [Basic usage](/doc/basic.md) to see if it works!
|
0 commit comments