server_maint 0.0.7 → 0.0.8

data/lib/cookbooks/postgresql/README.md

@@ -27,13 +27,21 @@ The following platforms are supported by this cookbook, meaning that the recipes
 ## Recipes
 
 * `postgresql` - Set up the apt repository and install dependent packages
+* `postgresql::apt_repository` - Internal recipe to setup the apt repository
 * `postgresql::client` - Front-end programs for PostgreSQL 9.x
-* `postgresql::server` - Object-relational SQL database, version 9.x server
+* `postgresql::configuration` - Internal recipe to manage configuration files
 * `postgresql::contrib` - Additional facilities for PostgreSQL
+* `postgresql::data_directory` - Internal recipe to setup the data directory
 * `postgresql::dbg` - Debug symbols for the server daemon
+* `postgresql::debian_backports` - Internal recipe to manage debian backports
 * `postgresql::doc` - Documentation for the PostgreSQL database management system
 * `postgresql::libpq` - PostgreSQL C client library and header files for libpq5 (PostgreSQL library)
+* `postgresql::pg_database` - Internal recipe to manage specified databases
+* `postgresql::pg_user` - Internal recipe to manage specified users
 * `postgresql::postgis` - Geographic objects support for PostgreSQL 9.x
+* `postgresql::server` - Object-relational SQL database, version 9.x server
+* `postgresql::server_dev` - Development files for PostgreSQL server-side programming
+* `postgresql::service` - Internal recipe to declare the system service
 
 
 ## Usage
@@ -576,6 +584,8 @@ Many thanks go to the following who have contributed to making this cookbook eve
     * fix for missing ssl directives in `postgresql.conf`
 * **[@cdoughty77](https://github.com/cdoughty77)**
     * allow finer tuning inside pg_hba.conf file
+* **[@NOX73](https://github.com/NOX73)**
+    * fix `postgresql.conf` ssl parameter failure on 9.1
 
 
 

data/lib/cookbooks/postgresql/metadata.rb

@@ -4,16 +4,24 @@ maintainer_email "github@phlippers.net"
 license          "MIT"
 description      "Installs PostgreSQL, The world's most advanced open source database."
 long_description IO.read(File.join(File.dirname(__FILE__), "README.md"))
-version          "0.9.0"
+version          "0.10.1"
 
-recipe "postgresql",           "Set up the apt repository and install dependent packages"
-recipe "postgresql::client",   "Front-end programs for PostgreSQL 9.x"
-recipe "postgresql::server",   "Object-relational SQL database, version 9.x server"
-recipe "postgresql::contrib",  "Additional facilities for PostgreSQL"
-recipe "postgresql::dbg",      "Debug symbols for the server daemon"
-recipe "postgresql::doc",      "Documentation for the PostgreSQL database management system"
-recipe "postgresql::libpq",    "PostgreSQL C client library and header files for libpq5 (PostgreSQL library)"
-recipe "postgresql::postgis",  "Geographic objects support for PostgreSQL 9.x"
+recipe "postgresql",                   "Set up the apt repository and install dependent packages"
+recipe "postgresql::apt_repository",   "Internal recipe to setup the apt repository"
+recipe "postgresql::client",           "Front-end programs for PostgreSQL 9.x"
+recipe "postgresql::configuration",    "Internal recipe to manage configuration files"
+recipe "postgresql::contrib",          "Additional facilities for PostgreSQL"
+recipe "postgresql::data_directory",   "Internal recipe to setup the data directory"
+recipe "postgresql::dbg",              "Debug symbols for the server daemon"
+recipe "postgresql::debian_backports", "Internal recipe to manage debian backports"
+recipe "postgresql::doc",              "Documentation for the PostgreSQL database management system"
+recipe "postgresql::libpq",            "PostgreSQL C client library and header files for libpq5 (PostgreSQL library)"
+recipe "postgresql::pg_database",      "Internal recipe to manage specified databases"
+recipe "postgresql::pg_user",          "Internal recipe to manage specified users"
+recipe "postgresql::postgis",          "Geographic objects support for PostgreSQL 9.x"
+recipe "postgresql::server",           "Object-relational SQL database, version 9.x server"
+recipe "postgresql::server_dev",       "Development files for PostgreSQL server-side programming"
+recipe "postgresql::service",          "Internal recipe to declare the system service"
 
 %w[ubuntu debian].each do |os|
   supports os

data/lib/cookbooks/postgresql/recipes/apt_repository.rb

@@ -0,0 +1,17 @@
+#
+# Cookbook Name:: postgresql
+# Recipe:: apt_repository
+#
+
+
+# use `apt.postgresql.org` for primary package installation support
+apt_repository "apt.postgresql.org" do
+  uri "http://apt.postgresql.org/pub/repos/apt"
+  distribution "#{node["lsb"]["codename"]}-pgdg"
+  components ["main"]
+  key "http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc"
+  action :add
+end
+
+# automatically get repository key updates
+package "pgdg-keyring"

data/lib/cookbooks/postgresql/recipes/configuration.rb

@@ -0,0 +1,63 @@
+#
+# Cookbook Name:: postgresql
+# Recipe:: configuration
+#
+
+
+pg_version = node["postgresql"]["version"]
+
+# environment
+template "/etc/postgresql/#{pg_version}/main/environment" do
+  source "environment.erb"
+  owner  "postgres"
+  group  "postgres"
+  mode   "0644"
+  notifies :restart, "service[postgresql]"
+end
+
+# pg_ctl
+template "/etc/postgresql/#{pg_version}/main/pg_ctl.conf" do
+  source "pg_ctl.conf.erb"
+  owner  "postgres"
+  group  "postgres"
+  mode   "0644"
+  notifies :restart, "service[postgresql]"
+end
+
+# pg_hba
+template node["postgresql"]["hba_file"] do
+  source "pg_hba.conf.erb"
+  owner  "postgres"
+  group  "postgres"
+  mode   "0640"
+  notifies :restart, "service[postgresql]"
+end
+
+# pg_ident
+template node["postgresql"]["ident_file"] do
+  source "pg_ident.conf.erb"
+  owner  "postgres"
+  group  "postgres"
+  mode   "0640"
+  notifies :restart, "service[postgresql]"
+end
+
+# postgresql
+pg_template_source = node["postgresql"]["conf"].any? ? "custom" : "standard"
+template "/etc/postgresql/#{pg_version}/main/postgresql.conf" do
+  source "postgresql.conf.#{pg_template_source}.erb"
+  owner  "postgres"
+  group  "postgres"
+  mode   "0644"
+  variables(:configuration => node["postgresql"]["conf"])
+  notifies :restart, "service[postgresql]"
+end
+
+# start
+template "/etc/postgresql/#{pg_version}/main/start.conf" do
+  source "start.conf.erb"
+  owner  "postgres"
+  group  "postgres"
+  mode   "0644"
+  notifies :restart, "service[postgresql]", :immediately
+end

data/lib/cookbooks/postgresql/recipes/data_directory.rb

@@ -0,0 +1,25 @@
+#
+# Cookbook Name:: postgresql
+# Recipe:: data_directory
+#
+
+
+# ensure data directory exists
+directory node["postgresql"]["data_directory"] do
+  owner  "postgres"
+  group  "postgres"
+  mode   "0700"
+  not_if "test -f #{node["postgresql"]["data_directory"]}/PG_VERSION"
+end
+
+# initialize the data directory if necessary
+bash "postgresql initdb" do
+  user "postgres"
+  code <<-EOC
+  /usr/lib/postgresql/#{node["postgresql"]["version"]}/bin/initdb \
+    #{node["postgresql"]["initdb_options"]} \
+    -U postgres \
+    -D #{node["postgresql"]["data_directory"]}
+  EOC
+  creates "#{node["postgresql"]["data_directory"]}/PG_VERSION"
+end

data/lib/cookbooks/postgresql/recipes/debian_backports.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: postgresql
+# Recipe:: debian_backports
+#
+
+
+# backports for initial support
+apt_repository "debian-backports" do
+  uri "http://backports.debian.org/debian-backports"
+  distribution "#{node["lsb"]["codename"]}-backports"
+  components ["main"]
+  action :add
+end
+
+# backports support for debian
+%w[libpq5 postgresql-common].each do |pkg|
+  package pkg do
+    options "-t #{node["lsb"]["codename"]}-backports"
+  end
+end

data/lib/cookbooks/postgresql/recipes/default.rb

@@ -3,48 +3,17 @@
 # Recipe:: default
 #
 
-case node["platform"]
-when "ubuntu"
-
-  apt_repository "pitti-postgresql" do
-    uri "http://ppa.launchpad.net/pitti/postgresql/ubuntu"
-    distribution node["lsb"]["codename"]
-    components ["main"]
-    keyserver "keyserver.ubuntu.com"
-    key "8683D8A2"
-    action :add
-  end
 
-  # install common files
-  package "postgresql-common"
+# pin default package preferences
+cookbook_file "/etc/apt/preferences.d/pgdg.pref" do
+  source "pgdg.pref"
+end
 
+case node["platform"]
+when "ubuntu"
+  include_recipe "postgresql::apt_repository"
+  package "postgresql-common"  # install common files
 when "debian"
-
-  # backports for initial support
-  apt_repository "debian-backports" do
-    uri "http://backports.debian.org/debian-backports"
-    distribution "#{node["lsb"]["codename"]}-backports"
-    components ["main"]
-    action :add
-  end
-
-  cookbook_file "/etc/apt/preferences.d/pgdg.pref" do
-    source "pgdg.pref"
-  end
-
-  # backports support for debian
-  %w[libpq5 postgresql-common].each do |pkg|
-    package pkg do
-      options "-t #{node["lsb"]["codename"]}-backports"
-    end
-  end
-
-  # use `apt.postgresql.org` for primary package installation support
-  apt_repository "apt.postgresql.org" do
-    uri "http://apt.postgresql.org/pub/repos/apt"
-    distribution "#{node["lsb"]["codename"]}-pgdg"
-    components ["main"]
-    key "http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc"
-    action :add
-  end
+  include_recipe "postgresql::debian_backports"
+  include_recipe "postgresql::apt_repository"
 end

data/lib/cookbooks/postgresql/recipes/pg_database.rb

@@ -0,0 +1,21 @@
+#
+# Cookbook Name:: postgresql
+# Recipe:: pg_database
+#
+
+
+# setup databases
+node["postgresql"]["databases"].each do |database|
+  pg_database database["name"] do
+    owner database["owner"]
+    encoding database["encoding"]
+    template database["template"]
+    locale database["locale"]
+  end
+
+  pg_database_extensions database["name"] do
+    extensions database["extensions"]
+    languages database["languages"]
+    postgis database["postgis"]
+  end
+end

data/lib/cookbooks/postgresql/recipes/pg_user.rb

@@ -0,0 +1,13 @@
+#
+# Cookbook Name:: postgresql
+# Recipe:: pg_user
+#
+
+
+# setup users
+node["postgresql"]["users"].each do |user|
+  pg_user user["username"] do
+    privileges :superuser => user["superuser"], :createdb => user["createdb"], :login => user["login"]
+    password user["password"]
+  end
+end

data/lib/cookbooks/postgresql/recipes/server.rb

@@ -5,114 +5,20 @@
 
 include_recipe "postgresql"
 
-pg_version = node["postgresql"]["version"]
-
 # install the package
-package "postgresql-#{pg_version}"
-
-
-# ensure data directory exists
-directory node["postgresql"]["data_directory"] do
-  owner  "postgres"
-  group  "postgres"
-  mode   "0700"
-  not_if "test -f #{node["postgresql"]["data_directory"]}/PG_VERSION"
-end
-
-# initialize the data directory if necessary
-bash "postgresql initdb" do
-  user "postgres"
-  code <<-EOC
-  /usr/lib/postgresql/#{pg_version}/bin/initdb \
-    #{node["postgresql"]["initdb_options"]} \
-    -U postgres \
-    -D #{node["postgresql"]["data_directory"]}
-  EOC
-  creates "#{node["postgresql"]["data_directory"]}/PG_VERSION"
-end
-
-# environment
-template "/etc/postgresql/#{pg_version}/main/environment" do
-  source "environment.erb"
-  owner  "postgres"
-  group  "postgres"
-  mode   "0644"
-  notifies :restart, "service[postgresql]"
-end
+package "postgresql-#{node["postgresql"]["version"]}"
 
-# pg_ctl
-template "/etc/postgresql/#{pg_version}/main/pg_ctl.conf" do
-  source "pg_ctl.conf.erb"
-  owner  "postgres"
-  group  "postgres"
-  mode   "0644"
-  notifies :restart, "service[postgresql]"
-end
+# setup the data directory
+include_recipe "postgresql::data_directory"
 
-# pg_hba
-template node["postgresql"]["hba_file"] do
-  source "pg_hba.conf.erb"
-  owner  "postgres"
-  group  "postgres"
-  mode   "0640"
-  notifies :restart, "service[postgresql]"
-end
-
-# pg_ident
-template node["postgresql"]["ident_file"] do
-  source "pg_ident.conf.erb"
-  owner  "postgres"
-  group  "postgres"
-  mode   "0640"
-  notifies :restart, "service[postgresql]"
-end
-
-# postgresql
-pg_template_source = node["postgresql"]["conf"].any? ? "custom" : "standard"
-template "/etc/postgresql/#{pg_version}/main/postgresql.conf" do
-  source "postgresql.conf.#{pg_template_source}.erb"
-  owner  "postgres"
-  group  "postgres"
-  mode   "0644"
-  variables(:configuration => node["postgresql"]["conf"])
-  notifies :restart, "service[postgresql]"
-end
-
-# start
-template "/etc/postgresql/#{pg_version}/main/start.conf" do
-  source "start.conf.erb"
-  owner  "postgres"
-  group  "postgres"
-  mode   "0644"
-  notifies :restart, "service[postgresql]", :immediately
-end
+# add the configuration
+include_recipe "postgresql::configuration"
 
 # setup users
-node["postgresql"]["users"].each do |user|
-  pg_user user["username"] do
-    privileges :superuser => user["superuser"], :createdb => user["createdb"], :login => user["login"]
-    password user["password"]
-  end
-end
+include_recipe "postgresql::pg_user"
 
 # setup databases
-node["postgresql"]["databases"].each do |database|
-  pg_database database["name"] do
-    owner database["owner"]
-    encoding database["encoding"]
-    template database["template"]
-    locale database["locale"]
-  end
-
-  pg_database_extensions database["name"] do
-    extensions database["extensions"]
-    languages database["languages"]
-    postgis database["postgis"]
-  end
-end
+include_recipe "postgresql::pg_database"
 
-# define the service
-service "postgresql" do
-  supports :restart => true
-  action [:enable, :start]
-end
+# declare the system service
+include_recipe "postgresql::service"

data/lib/cookbooks/postgresql/recipes/server_dev.rb

@@ -0,0 +1,9 @@
+#
+# Cookbook Name:: postgresql
+# Recipe:: server_dev
+#
+
+include_recipe "postgresql"
+
+# install the package
+package "postgresql-server-dev-#{node["postgresql"]["version"]}"

data/lib/cookbooks/postgresql/recipes/service.rb

@@ -0,0 +1,11 @@
+#
+# Cookbook Name:: postgresql
+# Recipe:: service
+#
+
+
+# define the service
+service "postgresql" do
+  supports :restart => true
+  action [:enable, :start]
+end

data/lib/cookbooks/postgresql/templates/default/postgresql.conf.standard.erb

@@ -81,8 +81,10 @@ ssl = <%= node["postgresql"]["ssl"] %>        # (change requires restart)
 #ssl_ciphers = '<%= node["postgresql"]["ssl_ciphers"] %>'  # allowed SSL ciphers
           # (change requires restart)
 #ssl_renegotiation_limit = <%= node["postgresql"]["ssl_renegotiation_limit"] %>  # amount of data between renegotiations
+<% if node["postgresql"]["version"].to_f > 9.1 %>
 ssl_cert_file = '<%= node["postgresql"]["ssl_cert_file"] %>' # (change requires restart)
 ssl_key_file = '<%= node["postgresql"]["ssl_key_file"] %>'   # (change requires restart)
+<% end %>
 #password_encryption = <%= node["postgresql"]["password_encryption"] %>
 #db_user_namespace = <%= node["postgresql"]["db_user_namespace"] %>
 

data/lib/server_maint/version.rb

@@ -1,3 +1,3 @@
 module ServerMaint
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: server_maint
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -308,14 +308,22 @@ files:
 - lib/cookbooks/postgresql/definitions/pg_user.rb
 - lib/cookbooks/postgresql/files/default/pgdg.pref
 - lib/cookbooks/postgresql/metadata.rb
+- lib/cookbooks/postgresql/recipes/apt_repository.rb
 - lib/cookbooks/postgresql/recipes/client.rb
+- lib/cookbooks/postgresql/recipes/configuration.rb
 - lib/cookbooks/postgresql/recipes/contrib.rb
+- lib/cookbooks/postgresql/recipes/data_directory.rb
 - lib/cookbooks/postgresql/recipes/dbg.rb
+- lib/cookbooks/postgresql/recipes/debian_backports.rb
 - lib/cookbooks/postgresql/recipes/default.rb
 - lib/cookbooks/postgresql/recipes/doc.rb
 - lib/cookbooks/postgresql/recipes/libpq.rb
+- lib/cookbooks/postgresql/recipes/pg_database.rb
+- lib/cookbooks/postgresql/recipes/pg_user.rb
 - lib/cookbooks/postgresql/recipes/postgis.rb
 - lib/cookbooks/postgresql/recipes/server.rb
+- lib/cookbooks/postgresql/recipes/server_dev.rb
+- lib/cookbooks/postgresql/recipes/service.rb
 - lib/cookbooks/postgresql/templates/default/environment.erb
 - lib/cookbooks/postgresql/templates/default/pg_ctl.conf.erb
 - lib/cookbooks/postgresql/templates/default/pg_hba.conf.erb
@@ -398,7 +406,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2580774400873308883
+      hash: 1737788494550114766
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -407,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2580774400873308883
+      hash: 1737788494550114766
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23