Side by Side Diff: README.md
Issue 29323282:
Noissue - Add hint for Windows users regarding git auto-conversion of line endings (Closed)
Patch Set: Changed wording
Created Aug. 5, 2015, 3:35 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 26 matching lines...) Expand all Loading... | |
| 37 ----------------------- | 37 ----------------------- |
| 38 | 38 |
| 39 As with our other projects, all changes to our infrastructure should | 39 As with our other projects, all changes to our infrastructure should |
| 40 be made in a local development environment, and reviewed before | 40 be made in a local development environment, and reviewed before |
| 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 Git users on Windows may experience issues caused by automatic line ending | |
| 48 conversion if the git option `core.autocrlf` is set to `true`. It is therefor | |
|
mathias
2015/08/10 11:53:55
Typo? "therefore" =~ "daher/deswegen", while "ther
| |
| 49 recommended to set this option to `false` or `input`, e.g. by running | |
| 50 `git config --global core.autocrlf false`. | |
| 51 | |
| 47 ### Requirements | 52 ### Requirements |
| 48 | 53 |
| 49 * [VirtualBox](https://www.virtualbox.org/) | 54 * [VirtualBox](https://www.virtualbox.org/) |
| 50 * [Vagrant](http://vagrantup.com/) | 55 * [Vagrant](http://vagrantup.com/) |
| 51 * Both `modules/private` and `hiera/private` exist (see above) | 56 * Both `modules/private` and `hiera/private` exist (see above) |
| 52 | 57 |
| 53 ### Start a VM | 58 ### Start a VM |
| 54 | 59 |
| 55 For each production server, we have a Vagrant VM with the same host | 60 For each production server, we have a Vagrant VM with the same host |
| 56 name. | 61 name. |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 187 Monitoring is fully functional in any environment, including development. | 192 Monitoring is fully functional in any environment, including development. |
| 188 Here, after bootstrapping the `server4` box, one can access the Nagios GUI | 193 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/>. | 194 from the host machine via <https://nagiosadmin:nagiosadmin@10.8.0.99/>. |
| 190 | 195 |
| 191 The monitoring service of our production environment, however, is accessible | 196 The monitoring service of our production environment, however, is accessible |
| 192 via <https://monitoring.adblockplus.org/>. | 197 via <https://monitoring.adblockplus.org/>. |
| 193 Add yourself to _files/nagios-htpasswd_ in the _private_ module used on the | 198 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. | 199 server, or have someone add you if you don't have access. |
| 195 | 200 |
| 196 | 201 |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
