Side by Side Diff: README.md
Issue 6269682487132160:
Issue 2151 - Drop hiera/private in favor of modules/private/hiera (Closed)
Patch Set:
Created March 17, 2015, 9:06 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« .hgignore ('k')
|
Vagrantfile » ('j')
|
hiera/install_precise.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 Adblock Plus infrastructure | 1 Adblock Plus infrastructure |
| 2 =========================== | 2 =========================== |
| 3 | 3 |
| 4 The Adblock Plus infrastructure uses [Puppet](http://puppetlabs.com/) | 4 The Adblock Plus infrastructure uses [Puppet](http://puppetlabs.com/) |
| 5 to set up servers, and to have a realistic development environment. | 5 to set up servers, and to have a realistic development environment. |
| 6 | 6 |
| 7 Our Puppet manifests are only tested with Ubuntu 12.04 right now. | 7 Our Puppet manifests are only tested with Ubuntu 12.04 right now. |
| 8 | 8 |
| 9 Environment specific setup | 9 Environment specific setup |
| 10 -------------------------- | 10 -------------------------- |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 26 | 26 |
| 27 ln -s private-stub modules/private | 27 ln -s private-stub modules/private |
| 28 | 28 |
| 29 #### Windows | 29 #### Windows |
| 30 | 30 |
| 31 MKLINK /D modules\private private-stub | 31 MKLINK /D modules\private private-stub |
| 32 | 32 |
| 33 When creating a custom version, one may inspect the `modules/private-stub` | 33 When creating a custom version, one may inspect the `modules/private-stub` |
| 34 directory to determine which resources have to be provided. | 34 directory to determine which resources have to be provided. |
| 35 | 35 |
| 36 ### `hiera/private` | |
| 37 | |
| 38 Analogous to `modules/private`, [Hiera](https://docs.puppetlabs.com/hiera/1/) | |
| 39 configuration files specific to the current environment are expected to be | |
| 40 found in `hiera/private`. Default resources for development (and testing) | |
| 41 purposes are provided within `modules/private-stub/hiera`: | |
| 42 | |
| 43 #### UNIX-like | |
| 44 | |
| 45 ln -s ../modules/private-stub/hiera hiera/private | |
| 46 | |
| 47 #### Windows | |
| 48 | |
| 49 MKLINK /D ..\modules\private-stub\hiera hiera\private | |
| 50 | |
| 51 Note that custom versions are recommended to be tracked together with the | |
| 52 custom `private` module, if any. | |
| 53 | |
| 54 Development environment | 36 Development environment |
| 55 ----------------------- | 37 ----------------------- |
| 56 | 38 |
| 57 As with our other projects, all changes to our infrastructure should | 39 As with our other projects, all changes to our infrastructure should |
| 58 be made in a local development environment, and reviewed before | 40 be made in a local development environment, and reviewed before |
| 59 deployment. Thanks to Puppet, we can easily set up local VMs that | 41 deployment. Thanks to Puppet, we can easily set up local VMs that |
| 60 mirror our production environment. | 42 mirror our production environment. |
| 61 | 43 |
| 62 The most convenient way to do this is to use Vagrant, as described | 44 The most convenient way to do this is to use Vagrant, as described |
| 63 below. | 45 below. |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 205 Monitoring is fully functional in any environment, including development. | 187 Monitoring is fully functional in any environment, including development. |
| 206 Here, after bootstrapping the `server4` box, one can access the Nagios GUI | 188 Here, after bootstrapping the `server4` box, one can access the Nagios GUI |
| 207 from the host machine via <https://nagiosadmin:nagiosadmin@10.8.0.99/>. | 189 from the host machine via <https://nagiosadmin:nagiosadmin@10.8.0.99/>. |
| 208 | 190 |
| 209 The monitoring service of our production environment, however, is accessible | 191 The monitoring service of our production environment, however, is accessible |
| 210 via <https://monitoring.adblockplus.org/>. | 192 via <https://monitoring.adblockplus.org/>. |
| 211 Add yourself to _files/nagios-htpasswd_ in the _private_ module used on the | 193 Add yourself to _files/nagios-htpasswd_ in the _private_ module used on the |
| 212 server, or have someone add you if you don't have access. | 194 server, or have someone add you if you don't have access. |
| 213 | 195 |
| 214 | 196 |
| OLD | NEW |
« no previous file with comments
|
« .hgignore ('k')
|
Vagrantfile » ('j')
|
hiera/install_precise.py » ('J')
