From 6bdda8c65e55fcdab896cee9985bca3593c66c95 Mon Sep 17 00:00:00 2001
From: Jesse Wolfe <jes5199@gmail.com>
Date: Tue, 20 Apr 2010 14:15:06 -0700
Subject: feature #2276 Single Executable: "puppet cert"

Add "puppet cert" as the new invocation of "puppetca"

Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
---
 lib/puppet/application/ca.rb   | 76 ------------------------------------------
 lib/puppet/application/cert.rb | 76 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 76 deletions(-)
 delete mode 100644 lib/puppet/application/ca.rb
 create mode 100644 lib/puppet/application/cert.rb

(limited to 'lib')

diff --git a/lib/puppet/application/ca.rb b/lib/puppet/application/ca.rb
deleted file mode 100644
index ab7f607ee..000000000
--- a/lib/puppet/application/ca.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require 'puppet'
-require 'puppet/application'
-require 'puppet/ssl/certificate_authority'
-
-Puppet::Application.new(:ca) do
-
-    should_parse_config
-
-    attr_accessor :mode, :all, :ca, :digest
-
-    def find_mode(opt)
-        modes = Puppet::SSL::CertificateAuthority::Interface::INTERFACE_METHODS
-        tmp = opt.sub("--", '').to_sym
-        @mode = modes.include?(tmp) ? tmp : nil
-    end
-
-    option("--clean", "-c") do
-        @mode = :destroy
-    end
-
-    option("--all", "-a") do
-        @all = true
-    end
-
-    option("--digest DIGEST") do |arg|
-        @digest = arg
-    end
-
-    option("--debug", "-d") do |arg|
-        Puppet::Util::Log.level = :debug
-    end
-
-    Puppet::SSL::CertificateAuthority::Interface::INTERFACE_METHODS.reject {|m| m == :destroy }.each do |method|
-        option("--#{method}", "-%s" % method.to_s[0,1] ) do
-            find_mode("--#{method}")
-        end
-    end
-
-    option("--verbose", "-v") do
-        Puppet::Util::Log.level = :info
-    end
-
-    command(:main) do
-        if @all
-            hosts = :all
-        else
-            hosts = ARGV.collect { |h| puts h; h.downcase }
-        end
-        begin
-            @ca.apply(:revoke, :to => hosts) if @mode == :destroy
-            @ca.apply(@mode, :to => hosts, :digest => @digest)
-        rescue => detail
-            puts detail.backtrace if Puppet[:trace]
-            puts detail.to_s
-            exit(24)
-        end
-    end
-
-    setup do
-        if Puppet.settings.print_configs?
-            exit(Puppet.settings.print_configs ? 0 : 1)
-        end
-
-        Puppet::Util::Log.newdestination :console
-
-        Puppet::SSL::Host.ca_location = :only
-
-        begin
-            @ca = Puppet::SSL::CertificateAuthority.new
-        rescue => detail
-            puts detail.backtrace if Puppet[:trace]
-            puts detail.to_s
-            exit(23)
-        end
-    end
-end
diff --git a/lib/puppet/application/cert.rb b/lib/puppet/application/cert.rb
new file mode 100644
index 000000000..f48e5301a
--- /dev/null
+++ b/lib/puppet/application/cert.rb
@@ -0,0 +1,76 @@
+require 'puppet'
+require 'puppet/application'
+require 'puppet/ssl/certificate_authority'
+
+Puppet::Application.new(:cert) do
+
+    should_parse_config
+
+    attr_accessor :mode, :all, :ca, :digest
+
+    def find_mode(opt)
+        modes = Puppet::SSL::CertificateAuthority::Interface::INTERFACE_METHODS
+        tmp = opt.sub("--", '').to_sym
+        @mode = modes.include?(tmp) ? tmp : nil
+    end
+
+    option("--clean", "-c") do
+        @mode = :destroy
+    end
+
+    option("--all", "-a") do
+        @all = true
+    end
+
+    option("--digest DIGEST") do |arg|
+        @digest = arg
+    end
+
+    option("--debug", "-d") do |arg|
+        Puppet::Util::Log.level = :debug
+    end
+
+    Puppet::SSL::CertificateAuthority::Interface::INTERFACE_METHODS.reject {|m| m == :destroy }.each do |method|
+        option("--#{method}", "-%s" % method.to_s[0,1] ) do
+            find_mode("--#{method}")
+        end
+    end
+
+    option("--verbose", "-v") do
+        Puppet::Util::Log.level = :info
+    end
+
+    command(:main) do
+        if @all
+            hosts = :all
+        else
+            hosts = ARGV.collect { |h| puts h; h.downcase }
+        end
+        begin
+            @ca.apply(:revoke, :to => hosts) if @mode == :destroy
+            @ca.apply(@mode, :to => hosts, :digest => @digest)
+        rescue => detail
+            puts detail.backtrace if Puppet[:trace]
+            puts detail.to_s
+            exit(24)
+        end
+    end
+
+    setup do
+        if Puppet.settings.print_configs?
+            exit(Puppet.settings.print_configs ? 0 : 1)
+        end
+
+        Puppet::Util::Log.newdestination :console
+
+        Puppet::SSL::Host.ca_location = :only
+
+        begin
+            @ca = Puppet::SSL::CertificateAuthority.new
+        rescue => detail
+            puts detail.backtrace if Puppet[:trace]
+            puts detail.to_s
+            exit(23)
+        end
+    end
+end
-- 
cgit