| 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 Private files |    9 Private files | 
|   10 ------------- |   10 ------------- | 
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   44  |   44  | 
|   45         vagrant up server0 |   45         vagrant up server0 | 
|   46  |   46  | 
|   47 After you've made changes to Puppet manifests, you can update it like this: |   47 After you've made changes to Puppet manifests, you can update it like this: | 
|   48  |   48  | 
|   49         vagrant provision server0 |   49         vagrant provision server0 | 
|   50  |   50  | 
|   51 You can omit the VM name if you want to boot or provision all |   51 You can omit the VM name if you want to boot or provision all | 
|   52 VMs. This might take a while and eat quite a bit of RAM though. |   52 VMs. This might take a while and eat quite a bit of RAM though. | 
|   53  |   53  | 
 |   54 ### SSH to the server | 
 |   55  | 
 |   56 You can use vagrant to connect as the vagrant user: | 
 |   57  | 
 |   58     vagrant ssh server5 | 
 |   59  | 
 |   60 If you want to test "real" SSH access you can use the test user account defined | 
 |   61 in _private-stub_: | 
 |   62  | 
 |   63     ssh -i modules/private/files/id_rsa test@10.8.0.100 | 
 |   64  | 
 |   65 The default password for this user (required for the _sudo_ command) is "test". | 
 |   66  | 
|   54 Adding a server |   67 Adding a server | 
|   55 --------------- |   68 --------------- | 
|   56  |   69  | 
|   57 To set up a new server, you should first add it to the development |   70 To set up a new server, you should first add it to the development | 
|   58 environment and test the setup, then set up a corresponding production |   71 environment and test the setup, then set up a corresponding production | 
|   59 server. |   72 server. | 
|   60  |   73  | 
|   61 ### Development environment |   74 ### Development environment | 
|   62  |   75  | 
|   63 1. Add entries in _Vagrantfile_ and _manifests/vagrant.pp_ |   76 1. Add entries in _Vagrantfile_ and _manifests/vagrant.pp_ | 
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  215  |  228  | 
|  216         vagrant ssh server0 |  229         vagrant ssh server0 | 
|  217  |  230  | 
|  218 Then execute the following: |  231 Then execute the following: | 
|  219  |  232  | 
|  220         sudo deploy-anwiki |  233         sudo deploy-anwiki | 
|  221  |  234  | 
|  222 If you have a clone of anwiki (see _Requirements_), this will deploy |  235 If you have a clone of anwiki (see _Requirements_), this will deploy | 
|  223 it on the virtual machine. If not, it will clone anwiki from the |  236 it on the virtual machine. If not, it will clone anwiki from the | 
|  224 official repository. |  237 official repository. | 
| OLD | NEW |