web-puppet 0.1.1 → 0.2.0

data/README

@@ -2,15 +2,14 @@ A tiny ruby rack application which exposes the data from puppet as JSON over HTT
 
     gem install web-puppet
 
-Provides a simple command line tool which runs a built in web server. On accessing
-the specified port you should get a JSON response containing the current node information.
+Provides a simple command line tool which runs a built in web server. On accessing the specified port you should get a JSON response containing the current node information.
 
     web-puppet --help
     Usage: web-puppet [options] ...
 
     Configuration options:
             --no-daemonize               Don't daemonize the web server process
-        -p, --port PORT                  The port to run web-facter on
+        -p, --port PORT                  The port to run web-puppet on
         -c, --config FILE                The file to load with configuration options
         -h, --help                       Display this screenp
 
@@ -24,6 +23,13 @@ specifying the filename with the --config option above.
     password=george
     port=3009
     daemonize=true
+    filters="ec2_public_keys_0_openssh_key, ec2_userdata, sshdsakey, sshrsakey"
 
-Note that the port and daemonize options will override those on the command line.
-The username and password options enable HTTP basic authentication using those details.
+Note that the port and daemonize options will override those on the command line. The username and password options enable HTTP basic authentication using details specified.
+
+The filters option will remove sensitive items from the output, you can specify any keys you like and they'll be remove automatically.
+
+If you're using puppet to manage your puppetmaster then the provided puppet module might be of use. Include in your puppet module diretory and modify as needed. You can use like so:
+
+    import "web-puppet"
+    class { "webpuppet": username => "username", password => "password" }

data/lib/web-puppet.rb

@@ -6,12 +6,16 @@ require 'parseconfig'
 
 module  WebPuppet
   class App
-    def call env
 
+    def initialize(filters=[])
+      @filters = filters
+    end
+
+    def call env
       Puppet[:config] = "/etc/puppet/puppet.conf"
       Puppet.parse_config
 
-      Puppet[:clientyamldir] = "$yamldir"
+      Puppet[:clientyamldir] = Puppet[:yamldir]
       Puppet::Node.indirection.terminus_class = :yaml
 
       nodes = Puppet::Node.indirection.search("*")
@@ -20,6 +24,10 @@ module  WebPuppet
       nodes.each do |n|
         facts = Puppet::Node::Facts.indirection.find(n.name)
         tags = Puppet::Resource::Catalog.indirection.find(n.name).tags
+        @filters.each do |filter|
+          facts.values.delete(filter.strip)
+        end
+
         data[n.name] = {
           :facts => facts.values,
           :tags => tags
@@ -44,13 +52,19 @@ module  WebPuppet
     end
 
     def self.run!(options)
-      application = self.new
+
+      conf = options[:config] ? ParseConfig.new(options[:config]) : false
+
+      if conf && conf.get_value('filters')
+        application = self.new(conf.get_value('filters').split(','))
+      else
+        application = self.new
+      end
 
       daemonize = options[:daemonize]
       port = options[:port]
 
-      if options[:config]
-        conf = ParseConfig.new(options[:config])
+      if conf
         application = application.add_auth(conf) if conf.get_value('password')
         daemonize = conf.get_value('daemonize') ? conf.get_value('daemonize') == "true" : daemonize
         port = conf.get_value('port') ? conf.get_value('port') : port

data/lib/web-puppet/version.rb

@@ -1,3 +1,3 @@
 module WebPuppet
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/puppet/modules/web-puppet/files/web-puppet

@@ -0,0 +1,8 @@
+description "start and stop web-puppet"
+author "Gareth Rushgrove"
+
+expect daemon
+
+env RUBY_BIN=/usr/bin
+
+exec $RUBY_BIN/web-puppet --config /etc/web-puppet.conf

data/puppet/modules/web-puppet/manifests/init.pp

@@ -0,0 +1,32 @@
+class webpuppet(
+  $port = '9295',
+  $username = false,
+  $password = false
+) {
+
+  package { "web-puppet":
+    ensure   => installed,
+    provider => gem,
+  }
+
+  file { "/etc/web-puppet.conf":
+    ensure  => present,
+    content => template('web-puppet/web-puppet.conf'),
+    notify  => Service['web-puppet'],
+  }
+
+  file { "/etc/init/web-puppet.conf":
+    ensure  => present,
+    source  => "puppet:///modules/web-puppet/web-puppet",
+  }
+
+  service { "web-puppet":
+    ensure   => running,
+    provider => upstart,
+    require  => [
+      Package["web-puppet"],
+      File["/etc/init/web-puppet.conf"],
+    ]
+  }
+
+}

data/puppet/modules/web-puppet/templates/web-puppet.conf

@@ -0,0 +1,4 @@
+port=<%= port %>
+<% if username %>username=<%= username %><% end %>
+<% if password %>password=<%= password %><% end %>
+filters="ec2_public_keys_0_openssh_key, ec2_userdata, sshdsakey, sshrsakey"

data/web-puppet.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "rack"
-  s.add_runtime_dependency "puppet", ">= 2.7.0"
+  s.add_runtime_dependency "puppet", ">= 2.6.0"
   s.add_runtime_dependency "parseconfig"
 
   s.add_development_dependency "test-unit"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-puppet
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-06 00:00:00.000000000Z
+date: 2011-11-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70117041200400 !ruby/object:Gem::Requirement
+  requirement: &70241318720520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117041200400
+  version_requirements: *70241318720520
 - !ruby/object:Gem::Dependency
   name: puppet
-  requirement: &70117041199780 !ruby/object:Gem::Requirement
+  requirement: &70241318720020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70117041199780
+  version_requirements: *70241318720020
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &70117041199260 !ruby/object:Gem::Requirement
+  requirement: &70241318719600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117041199260
+  version_requirements: *70241318719600
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70117041198680 !ruby/object:Gem::Requirement
+  requirement: &70241318719140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70117041198680
+  version_requirements: *70241318719140
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70117041198200 !ruby/object:Gem::Requirement
+  requirement: &70241318718720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70117041198200
+  version_requirements: *70241318718720
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70117041197760 !ruby/object:Gem::Requirement
+  requirement: &70241318718300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70117041197760
+  version_requirements: *70241318718300
 description: Daemon which serves information from a local puppet master as JSON over
   HTTP
 email:
@@ -94,6 +94,9 @@ files:
 - bin/web-puppet
 - lib/web-puppet.rb
 - lib/web-puppet/version.rb
+- puppet/modules/web-puppet/files/web-puppet
+- puppet/modules/web-puppet/manifests/init.pp
+- puppet/modules/web-puppet/templates/web-puppet.conf
 - test/integration_test.rb
 - test/test_helper.rb
 - web-puppet.gemspec