Issue 122 - Puppet ENC via Hiera

README.md

 Adblock Plus infrastructure
 ===========================
 
 The Adblock Plus infrastructure uses [Puppet](http://puppetlabs.com/)
 to set up servers, and to have a realistic development environment.
 
 Our Puppet manifests are only tested with Ubuntu 12.04 right now.
 
 Environment specific setup
 --------------------------
 
 Some infrastructure parts are specific to the environment (such as e.g.
 *development*, *test* and *production*) whilst passwords, for example,
 are confidential. In order to allow for such specific configuration, the
 repository requires a set of manual operations during the initial setup:
 
 ### `modules/private`
 
 The `private` module is destined to store confidential information such as
 [RSA](http://en.wikipedia.org/wiki/RSA_%28cryptosystem%29) keys, `htpasswd`
 files and so on. The repository provides a `private-stub` module containing
-defaults suitable for development and testing purpose. One can create a

[Felix Dahlke, 2015/03/09 23:14:51]

Should be: "testing purposeS"

[mathias, 2015/03/16 12:07:11]

Done.

+defaults suitable for development and testing purposes. One can create a
 symbolic link to start using the resource:
 
 #### UNIX-like
 
     ln -s private-stub modules/private
 
 #### Windows
 
     MKLINK /D modules\private private-stub
 
 When creating a custom version, one may inspect the `modules/private-stub`
 directory to determine which resources have to be provided.
 
 ### `hiera/private`
 
 Analogous to `modules/private`, [Hiera](https://docs.puppetlabs.com/hiera/1/)
 configuration files specific to the current environment are expected to be
 found in `hiera/private`. Default resources for development (and testing)
-purpose are provided within `modules/private-stub/hiera`:

[Felix Dahlke, 2015/03/09 23:14:51]

"purposeS" again

[mathias, 2015/03/16 12:07:11]

Done.

+purposes are provided within `modules/private-stub/hiera`:
 
 #### UNIX-like
 
     ln -s ../modules/private-stub/hiera hiera/private
 
 #### Windows
 
     MKLINK /D ..\modules\private-stub\hiera hiera\private
 
 Note that custom versions are recommended to be tracked together with the
@@ skipping 51 matching lines @@
 To set up a new host, extend the custom `hiera/private/host.yaml` by another
 `servers:` item, e.g.:
 
     # ...
     custom1:
         ip: [10.8.0.254]
         dns: foobar.example.com
         ssh_public_key: AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAA...
         role: codereviewserver
 
-See `modules/base/manifests/init.pp`, especially the `explicit_host_record()`

[Felix Dahlke, 2015/03/09 23:14:51]

sounds weird, I'd say "especially the type named `explicit_host_record()`"

[mathias, 2015/03/16 12:07:11]

Fair enough, though it's actually a "named type" and not a "type named foo".
Let's see if you like the new version more.. :)

-named type within class `base`, for more information on the possible option
-keys and values.
+See `modules/base/manifests/init.pp`, especially the definition of the named
+type `explicit_host_record()` within class `base`, for more information on the
+possible option keys and values.
 
 In development, this is all that needs to be done before the new box can be
 started using `vagrant up ...`. Production servers, however, need a working
 Puppet configuration first (see below).
 
 Configuring Puppet
 ------------------
 
 ### Prerequisites
 
 1. Install Ubuntu Server 12.04 LTS
-2. Run `hiera/install-precise.py` as user `root` to install Puppet and Hiera
+2. Run `hiera/install_precise.py` as user `root` to install Puppet and Hiera
 3. Enable pluginsync (Add the following to the _main_ section in
    _/etc/puppet/puppet.conf_)
 
         pluginsync=true
 
 4. Configure the master address (Add the following to the bottom of
         _/etc/puppet/puppet.conf_)
 
         [agent]
         server = puppetmaster.adblockplus.org
@@ skipping 67 matching lines @@
 Monitoring is fully functional in any environment, including development.
 Here, after bootstrapping the `server4` box, one can access the Nagios GUI
 from the host machine via <https://nagiosadmin:nagiosadmin@10.8.0.99/>.
 
 The monitoring service of our production environment, however, is accessible
 via <https://monitoring.adblockplus.org/>.
 Add yourself to _files/nagios-htpasswd_ in the _private_ module used on the
 server, or have someone add you if you don't have access.