Side by Side Diff: README.md
Patch Set:
Created Jan. 11, 2018, 5:21 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 103 | 103 |
| 104 In development, this is all that needs to be done before the new box can be | 104 In development, this is all that needs to be done before the new box can be |
| 105 started using `vagrant up ...`. Production servers, however, need a working | 105 started using `vagrant up ...`. Production servers, however, need a working |
| 106 Puppet configuration first (see below). | 106 Puppet configuration first (see below). |
| 107 | 107 |
| 108 Configuring Puppet | 108 Configuring Puppet |
| 109 ------------------ | 109 ------------------ |
| 110 | 110 |
| 111 ### Prerequisites | 111 ### Prerequisites |
| 112 | 112 |
| 113 1. Install Ubuntu Server 12.04 LTS | 113 1. Install Debian Jessie |
| 114 2. Run `hiera/install_precise.py` as user `root` to install Puppet and Hiera | 114 2. Install necessary packages (as root or with sudo): |
| 115 3. Enable pluginsync (Add the following to the _main_ section in | |
| 116 _/etc/puppet/puppet.conf_) | |
| 117 | 115 |
| 118 » pluginsync=true | 116 apt update |
| 117 apt install puppet apt-transport-https | |
| 119 | 118 |
| 120 4. Configure the master address (Add the following to the bottom of | 119 3. Modify `/etc/puppet/puppet.conf` as follows: |
| 121 » _/etc/puppet/puppet.conf_) | |
| 122 | 120 |
| 123 » [agent] | 121 ``` |
| 124 » server = puppetmaster.adblockplus.org | 122 [main] |
| 123 ... | |
| 124 pluginsync=true | |
| 125 ... | |
| 126 [agent] | |
| 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.
| |
| 125 | 129 |
| 126 Now you can either set it up as a pure agent or as a master. The | 130 Now you can either set it up as a pure agent or as a master. The |
| 127 master provides the configuration, agents fetch it from the master and | 131 master provides the configuration, agents fetch it from the master and |
| 128 apply it locally. The master is also an agent, fetching configuration | 132 apply it locally. The master is also an agent, fetching configuration |
| 129 from itself. | 133 from itself. |
| 130 | 134 |
| 135 #### Ubuntu variation (legacy setup) | |
| 136 | |
| 137 Like with debian, but the first two steps as follows: | |
| 138 | |
| 139 1. Install Ubuntu Server 12.04 LTS | |
| 140 2. Run `hiera/install_precise.py` as user `root` to install Puppet and Hiera | |
| 141 | |
| 131 ### Puppet agent | 142 ### Puppet agent |
| 132 | 143 |
| 133 1. Attempt an initial provisioning, this will fail | 144 1. Attempt an initial provisioning, this will fail |
| 134 | 145 |
| 135 puppet agent --test | 146 puppet agent --test |
| 136 | 147 |
| 137 2. On the master: List the certificates to get the name of the new | 148 2. On the master: List the certificates to get the name of the new |
| 138 agent's certificate | 149 agent's certificate |
| 139 | 150 |
| 140 puppet cert list | 151 puppet cert list |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 192 Monitoring is fully functional in any environment, including development. | 203 Monitoring is fully functional in any environment, including development. |
| 193 Here, after bootstrapping the `server4` box, one can access the Nagios GUI | 204 Here, after bootstrapping the `server4` box, one can access the Nagios GUI |
| 194 from the host machine via <https://nagiosadmin:nagiosadmin@10.8.0.99/>. | 205 from the host machine via <https://nagiosadmin:nagiosadmin@10.8.0.99/>. |
| 195 | 206 |
| 196 The monitoring service of our production environment, however, is accessible | 207 The monitoring service of our production environment, however, is accessible |
| 197 via <https://monitoring.adblockplus.org/>. | 208 via <https://monitoring.adblockplus.org/>. |
| 198 Add yourself to _files/nagios-htpasswd_ in the _private_ module used on the | 209 Add yourself to _files/nagios-htpasswd_ in the _private_ module used on the |
| 199 server, or have someone add you if you don't have access. | 210 server, or have someone add you if you don't have access. |
| 200 | 211 |
| 201 | 212 |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
