Delta Between Two Patch Sets: README.md
Left Patch Set:
Created Jan. 11, 2018, 5:21 p.m.
Right Patch Set: Fix indentation
Created Jan. 16, 2018, 12:57 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« no previous file
|
no next file »
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 111 ### Prerequisites | 111 ### Prerequisites |
| 112 | 112 |
| 113 1. Install Debian Jessie | 113 1. Install Debian Jessie |
| 114 2. Install necessary packages (as root or with sudo): | 114 2. Install necessary packages (as root or with sudo): |
| 115 | 115 |
| 116 apt update | 116 apt update |
| 117 apt install puppet apt-transport-https | 117 apt install puppet apt-transport-https |
| 118 | 118 |
| 119 3. Modify `/etc/puppet/puppet.conf` as follows: | 119 3. Modify `/etc/puppet/puppet.conf` as follows: |
| 120 | 120 |
| 121 ``` | 121 [main] |
| 122 [main] | 122 ... |
| 123 ... | 123 pluginsync=true |
| 124 pluginsync=true | 124 ... |
| 125 ... | 125 [agent] |
| 126 [agent] | 126 server = puppetmaster.adblockplus.org |
| 127 server = puppetmaster.adblockplus.org | |
| 128 ``` | |
|
mathias
2018/01/15 12:57:23
Please use indentation by 4 spaces, for consistenc
f.nicolaisen
2018/01/16 12:56:59
Acknowledged.
| |
| 129 | 127 |
| 130 Now you can either set it up as a pure agent or as a master. The | 128 Now you can either set it up as a pure agent or as a master. The |
| 131 master provides the configuration, agents fetch it from the master and | 129 master provides the configuration, agents fetch it from the master and |
| 132 apply it locally. The master is also an agent, fetching configuration | 130 apply it locally. The master is also an agent, fetching configuration |
| 133 from itself. | 131 from itself. |
| 134 | 132 |
| 135 #### Ubuntu variation (legacy setup) | 133 #### Ubuntu variation (legacy setup) |
| 136 | 134 |
| 137 Like with debian, but the first two steps as follows: | 135 Like with debian, but the first two steps as follows: |
| 138 | 136 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 203 Monitoring is fully functional in any environment, including development. | 201 Monitoring is fully functional in any environment, including development. |
| 204 Here, after bootstrapping the `server4` box, one can access the Nagios GUI | 202 Here, after bootstrapping the `server4` box, one can access the Nagios GUI |
| 205 from the host machine via <https://nagiosadmin:nagiosadmin@10.8.0.99/>. | 203 from the host machine via <https://nagiosadmin:nagiosadmin@10.8.0.99/>. |
| 206 | 204 |
| 207 The monitoring service of our production environment, however, is accessible | 205 The monitoring service of our production environment, however, is accessible |
| 208 via <https://monitoring.adblockplus.org/>. | 206 via <https://monitoring.adblockplus.org/>. |
| 209 Add yourself to _files/nagios-htpasswd_ in the _private_ module used on the | 207 Add yourself to _files/nagios-htpasswd_ in the _private_ module used on the |
| 210 server, or have someone add you if you don't have access. | 208 server, or have someone add you if you don't have access. |
| 211 | 209 |
| 212 | 210 |
| LEFT | RIGHT |
« no previous file
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
