Drop thin support

fixes #110

Author: tampakrap

.fixtures.yml

@@ -16,7 +16,6 @@ fixtures:
     inifile: "puppetlabs/inifile"
     apache: "puppetlabs/apache"
     portage: "gentoo/portage"
-    thin: "danieldreier/thin"
     puppetdb: "puppetlabs/puppetdb"
   symlinks:
     puppet: "#{source_dir}"

README.md

@@ -33,7 +33,7 @@ master similar to running Apache, Nginx, or MySQL using puppet.
 Depending on how you use this module, it can touch any of:
 * Puppet configuration files
 * Nginx or Apache configurations needed for running a master
-* Unicorn, Passenger, and thin configurations and init scripts
+* Unicorn and Passenger configurations and init scripts
 * PuppetDB and PostgreSQL
 
 As far as possible, this module tries to use other general-purpose modules to
@@ -73,9 +73,8 @@ This should get you a puppetmaster running under `webrick` which might scale to
 about `10` nodes if the wind doesn't blow too hard.
 
 If, however, the moon is in the next phase then you probably want to use
-something that scales a bit more. Your options are nginx/unicorn,
-apache/passenger, or nginx/thin (but thin support in this module is deprecated
-because nobody seems to be using it).
+something that scales a bit more. Your options are nginx/unicorn or
+apache/passenger.
 
 #### Nginx/Unicorn Master
 The most basic setup would look something like:

manifests/server.pp

@@ -67,7 +67,7 @@
 
   $service = $servertype ? {
     'passenger'    => 'httpd',
-    /unicorn|thin/ => 'nginx',
+    'unicorn'      => 'nginx',
     'standalone'   => $puppet::params::master_service,
   }
 
@@ -105,18 +105,11 @@
       $ssl_protocols            = pick($serverssl_protos, 'TLSv1.2 TLSv1.1 TLSv1 SSLv3')
       $ssl_ciphers              = pick($serverssl_ciphers, 'HIGH:!aNULL:!MD5')
     }
-    'thin': {
-      include puppet::server::thin
-      $ssl_client_header        = 'HTTP_X_CLIENT_DN'
-      $ssl_client_verify_header = 'HTTP_X_CLIENT_VERIFY'
-      $ssl_protocols            = pick($serverssl_protos, 'TLSv1.2 TLSv1.1 TLSv1 SSLv3')
-      $ssl_ciphers              = pick($serverssl_ciphers, 'HIGH:!aNULL:!MD5')
-    }
     'standalone': {
       include puppet::server::standalone
     }
     default: {
-      err('Only "passenger", "thin", "unicorn" and "standalone" are valid options for servertype')
+      err('Only "passenger", "unicorn" and "standalone" are valid options for servertype')
       fail('Servertype "$servertype" not implemented')
     }
   }

manifests/server/thin.pp

@@ -36,10 +36,6 @@
       "name": "jfryman/nginx",
       "version_requirement": ">= 0.2.0 <1.0.0"
     },
-    {
-      "name": "danieldreier/thin",
-      "version_requirement": ">= 0.1.0 <1.0.0"
-    },
     {
       "name": "puppetlabs/puppetdb",
       "version_requirement": ">= 4.1.0 <5.0.0"

metadata.json

@@ -25,7 +25,7 @@
     let(:facts) { facthash }
 
     context "running on #{name}" do
-      ['standalone','passenger','unicorn','thin'].each do |server_type|
+      ['standalone','passenger','unicorn'].each do |server_type|
         context "servertype => #{server_type}" do
           let(:params) {{
             :servertype   => server_type,
@@ -68,14 +68,6 @@
                 should contain_service('nginx').with({:ensure => "running"})
                 should contain_service('unicorn_puppetmaster').with({:ensure => "running"})
               }
-            when 'thin'
-              it {
-                should contain_class('puppet::server::thin')
-                should contain_service('puppetmaster').with({ :ensure => "stopped" })
-                should contain_service('nginx').with({:ensure => "running"})
-                should contain_service('thin-puppetmaster').with({:ensure => "running"})
-                should contain_file('/etc/thin.d/puppetmaster.yml')
-              }
           end
         end
       end

spec/acceptance/thin_server_spec.rb

@@ -52,7 +52,6 @@
 mod 'inifile',        :git => 'git://github.com/puppetlabs/puppetlabs-inifile.git'
 mod 'apache',         :git => 'git://github.com/puppetlabs/puppetlabs-apache.git'
 mod 'portage',        :git => 'git://github.com/gentoo/puppet-portage.git'
-mod 'thin',           :git => 'git://github.com/danieldreier/puppet-thin.git'
 
 
   EOS