| 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 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 * [VirtualBox](https://www.virtualbox.org/) | 34 * [VirtualBox](https://www.virtualbox.org/) |
| 35 * [Vagrant](http://vagrantup.com/) | 35 * [Vagrant](http://vagrantup.com/) |
| 36 * _modules/private_ exists (see above) | 36 * _modules/private_ exists (see above) |
| 37 | 37 |
| 38 ### Start a VM | 38 ### Start a VM |
| 39 | 39 |
| 40 For each production server, we have a Vagrant VM with the same host | 40 For each production server, we have a Vagrant VM with the same host |
| 41 name. | 41 name. |
| 42 | 42 |
| 43 To start the _server0_ VM: | 43 To start the _server1_ VM: |
| 44 | 44 |
| 45 » vagrant up server0 | 45 » vagrant up server1 |
| 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 server1 |
| 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 | 54 ### SSH to the server |
| 55 | 55 |
| 56 You can use vagrant to connect as the vagrant user: | 56 You can use vagrant to connect as the vagrant user: |
| 57 | 57 |
| 58 vagrant ssh server5 | 58 vagrant ssh server5 |
| 59 | 59 |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 | 170 |
| 171 Monitoring is fully functional in the development environment: | 171 Monitoring is fully functional in the development environment: |
| 172 [https://10.8.0.98/](https://10.8.0.98/) | 172 [https://10.8.0.98/](https://10.8.0.98/) |
| 173 | 173 |
| 174 User name and password are both _nagiosadmin_. | 174 User name and password are both _nagiosadmin_. |
| 175 | 175 |
| 176 The monitoring service of our production environment runs on | 176 The monitoring service of our production environment runs on |
| 177 _monitoring.adblockplus.org_. Add yourself to _files/nagios-htpasswd_ | 177 _monitoring.adblockplus.org_. Add yourself to _files/nagios-htpasswd_ |
| 178 in the _private_ module used on the server, or have someone add you if | 178 in the _private_ module used on the server, or have someone add you if |
| 179 you don't have access. | 179 you don't have access. |
| 180 | |
| 181 Website development | |
| 182 ------------------- | |
| 183 | |
| 184 ### Requirements | |
| 185 | |
| 186 * A clone of the _anwiki_ repository, next to this directory. | |
| 187 * The running _server0_ VM. | |
| 188 | |
| 189 ### Set up anwiki | |
| 190 | |
| 191 1. Go to [http://10.8.0.97](http://10.8.0.97). | |
| 192 | |
| 193 2. Click on the green _Begin installation_ button. | |
| 194 | |
| 195 3. Enter _http://10.8.0.97/_ as _Root URL_ and empty the _Cookies | |
| 196 domain_ field. | |
| 197 | |
| 198 4. Click on _Edit MySQL Connection_ and enter _anwiki_ as _user_ and | |
| 199 _database_, _vagrant_ as password. You'll have to repeat this step for | |
| 200 each plugin. | |
| 201 | |
| 202 5. Press all the green buttons until you're asked to create an account. Do so. | |
| 203 | |
| 204 6. Click on _Don't ping_, ignore the error message on the next page | |
| 205 and proceed to the website. | |
| 206 | |
| 207 7. Go to | |
| 208 [http://10.8.0.97/en/_include/menu](http://10.8.0.97/en/_include/menu). | |
| 209 | |
| 210 8. Click on _Delete_ and then on _Delete the page in ALL languages_. | |
| 211 | |
| 212 9. Click on _Manage_ in the lower right area, then on _Edit | |
| 213 configuration_. | |
| 214 | |
| 215 10. Click on _Edit location_, set _Home_ to _en_ and check _Friendly | |
| 216 URLs_, then click on _Save settings_. | |
| 217 | |
| 218 11. Click on _Manage_ again, then _Import contents_. | |
| 219 | |
| 220 12. Chose an export file from the production website. Then _Upload | |
| 221 now_. | |
| 222 | |
| 223 13. Click on _all_ and _Import now_. | |
| 224 | |
| 225 ### Update anwiki | |
| 226 | |
| 227 SSH to the server: | |
| 228 | |
| 229 vagrant ssh server0 | |
| 230 | |
| 231 Then execute the following: | |
| 232 | |
| 233 sudo deploy-anwiki | |
| 234 | |
| 235 If you have a clone of anwiki (see _Requirements_), this will deploy | |
| 236 it on the virtual machine. If not, it will clone anwiki from the | |
| 237 official repository. | |
| OLD | NEW |