split postgresql::server in its own file, and clean puppet-lint warning

3 files changed, 60 insertions, 62 deletions

diff --git a/modules/postgresql/manifests/config.pp b/modules/postgresql/manifests/config.pp
new file mode 100644
index 00000000..a9f2ad7f
--- /dev/null
+++ b/modules/postgresql/manifests/config.pp
@@ -0,0 +1,10 @@
+define postgresql::config($content) {
+    file { $name:
+        owner   => 'postgres',
+        group   => 'postgres',
+        mode    => '0600',
+        content => $content,
+        require => Package['postgresql-server'],
+        notify  => Exec['service postgresql reload'],
+    }
+}
diff --git a/modules/postgresql/manifests/init.pp b/modules/postgresql/manifests/init.pp
index 1774b510..058d1433 100644
--- a/modules/postgresql/manifests/init.pp
+++ b/modules/postgresql/manifests/init.pp
@@ -1,66 +1,4 @@
 class postgresql {
-    class server { 
-        $pgsql_data = "/var/lib/pgsql/data/"
-        $pg_version = '9.0'
-    
-        # missing requires is corrected in cooker, 
-        # should be removed
-        # once the fix is in a stable release 
-        package { "postgresql${pg_version}-plpgsql":
-            alias => "postgresql-plpgsql",
-        }
-    
-        package { "postgresql${pg_version}-server":
-            alias => "postgresql-server",
-            require => Package['postgresql-plpgsql'],
-        }
-    
-        service { postgresql:
-            subscribe => Package["postgresql-server"],
-        }
-    
-        exec { "service postgresql reload":
-            refreshonly => true,
-        }
-   
-        openssl::self_signed_splitted_cert { "pgsql.$domain":
-            filename => "server",
-            directory => $pgsql_data,
-            owner => "postgres",
-            group => "postgres",
-            require => Package['postgresql-server']
-        }
-
-
-        file { '/etc/pam.d/postgresql':
-            content => template("postgresql/pam"),
-        }
-
-        define config($content) {
-            file { "$name":
-                owner => postgres,
-                group => postgres,
-                mode => 600,
-                content => $content,
-                require => Package["postgresql-server"],
-                notify => Exec['service postgresql reload'],
-            }
-        }
-
-
-        $db = list_exported_ressources('Postgresql::Db_and_user')
-
-        $forum_lang = list_exported_ressources('Phpbb::Locale_db')
-
-        config {
-            "$pgsql_data/pg_hba.conf": content => template("postgresql/pg_hba.conf");
-            "$pgsql_data/pg_ident.conf": content => template("postgresql/pg_ident.conf");
-            "$pgsql_data/postgresql.conf": content => template("postgresql/postgresql.conf");
-        }
-    
-    }
-
-
     define remote_db_and_user($description = "",
                               $tag = "default",
                               $callback_notify = "", 
diff --git a/modules/postgresql/manifests/server.pp b/modules/postgresql/manifests/server.pp
new file mode 100644
index 00000000..84be87ad
--- /dev/null
+++ b/modules/postgresql/manifests/server.pp
@@ -0,0 +1,50 @@
+class postgresql::server {
+    $pgsql_data = '/var/lib/pgsql/data/'
+    $pg_version = '9.0'
+
+    # missing requires is corrected in cooker,
+    # should be removed
+    # once the fix is in a stable release
+    package { "postgresql${pg_version}-plpgsql":
+        alias => 'postgresql-plpgsql',
+    }
+
+    package { "postgresql${pg_version}-server":
+        alias   => 'postgresql-server',
+        require => Package['postgresql-plpgsql'],
+    }
+
+    service { 'postgresql':
+        subscribe => Package['postgresql-server'],
+    }
+
+    exec { 'service postgresql reload':
+        refreshonly => true,
+    }
+
+    openssl::self_signed_splitted_cert { "pgsql.$::domain":
+        filename  => 'server',
+        directory => $pgsql_data,
+        owner     => 'postgres',
+        group     => 'postgres',
+        require   => Package['postgresql-server']
+    }
+
+
+    file { '/etc/pam.d/postgresql':
+        content => template('postgresql/pam'),
+    }
+
+    $db = list_exported_ressources('Postgresql::Db_and_user')
+
+    $forum_lang = list_exported_ressources('Phpbb::Locale_db')
+
+    postgresql::config {
+        "$pgsql_data/pg_hba.conf":
+            content => template('postgresql/pg_hba.conf');
+        "$pgsql_data/pg_ident.conf":
+            content => template('postgresql/pg_ident.conf');
+        "$pgsql_data/postgresql.conf":
+            content => template('postgresql/postgresql.conf');
+    }
+}