Side by Side Diff: README.md
Issue 29323287:
Issue 2859 - Remove outdated hiera/private requirement from README.md (Closed)
Patch Set:
Created Aug. 5, 2015, 4:13 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
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 30 matching lines...) Expand all Loading... | |
| 41 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 |
| 42 mirror our production environment. | 42 mirror our production environment. |
| 43 | 43 |
| 44 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 |
| 45 below. | 45 below. |
| 46 | 46 |
| 47 ### Requirements | 47 ### Requirements |
| 48 | 48 |
| 49 * [VirtualBox](https://www.virtualbox.org/) | 49 * [VirtualBox](https://www.virtualbox.org/) |
| 50 * [Vagrant](http://vagrantup.com/) | 50 * [Vagrant](http://vagrantup.com/) |
| 51 * Both `modules/private` and `hiera/private` exist (see above) | 51 * `modules/private` exists (see above) |
| 52 | 52 |
| 53 ### Start a VM | 53 ### Start a VM |
| 54 | 54 |
| 55 For each production server, we have a Vagrant VM with the same host | 55 For each production server, we have a Vagrant VM with the same host |
| 56 name. | 56 name. |
| 57 | 57 |
| 58 To start the _filter1_ VM: | 58 To start the _filter1_ VM: |
| 59 | 59 |
| 60 vagrant up filter1 | 60 vagrant up filter1 |
| 61 | 61 |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 187 Monitoring is fully functional in any environment, including development. | 187 Monitoring is fully functional in any environment, including development. |
| 188 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 |
| 189 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/>. |
| 190 | 190 |
| 191 The monitoring service of our production environment, however, is accessible | 191 The monitoring service of our production environment, however, is accessible |
| 192 via <https://monitoring.adblockplus.org/>. | 192 via <https://monitoring.adblockplus.org/>. |
| 193 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 |
| 194 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. |
| 195 | 195 |
| 196 | 196 |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
