Install PostgreSQL server in postgres recipe and connect locally

It's strange that we install a MySQL server in the mysql recipe but
don't install a PostgreSQL server in the postgres recipe.

This allows us to treat the server as local when creating the user and
database, simplifying the recipe.

The recipe no longer references the userhost attribute as this concept
does not exist in PostgreSQL.

Recent GitLab versions require the pg_trgm extension, which we now
install via the postgresql::contrib recipe. This really should be a
resource but we can force override node['postgresql']['database_name']
in the short term. We could install the extension to template1 instead
but this will not help existing users.

Author: chewi

attributes/default.rb

@@ -55,7 +55,6 @@
 default['gitlab']['database']['database'] = 'gitlab'
 default['gitlab']['database']['username'] = 'gitlab'
 default['gitlab']['database']['userhost'] = '127.0.0.1'
-default['gitlab']['postgresql']['username'] = 'postgres'
 default['gitlab']['database']['password'] = nil
 
 # Ruby setup
@@ -157,6 +156,9 @@
 default['mysql']['server_root_password'] = 'Ch4ngm3'
 default['build-essential']['compile_time'] = true # needed for mysql chef_gem
 
+# PostgreSQL
+default['postgresql']['contrib']['extensions'] = ['pg_trgm']
+
 # nginx
 default['nginx']['default_site_enabled'] = false
 

recipes/postgres.rb

@@ -16,6 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
+include_recipe 'postgresql::server'
 include_recipe 'database::postgresql'
 
 # Enable secure password generation
@@ -31,38 +33,20 @@
   end
 end
 
-# Helper variables
-database = node['gitlab']['database']['database']
-database_user = node['gitlab']['database']['username']
-database_override_user = node['postgresql']['username']
-database_password = node['gitlab']['database']['password']
-database_host = node['gitlab']['database']['host']
-database_userhost = node['gitlab']['database']['userhost']
-database_connection = {
-  host: database_host,
-  port: '5432',
-  username: database_override_user,
-  password: node['postgresql']['password']['postgres']
-}
-
-# Create the database
-postgresql_database database do
-  connection database_connection
+# Create the database user
+postgresql_database_user node['gitlab']['database']['username'] do
+  connection :host => 'localhost'
+  password node['gitlab']['database']['password']
   action :create
 end
 
-# Create the database user
-postgresql_database_user database_user do
-  connection database_connection
-  password database_password
-  host database_userhost
-  database_name database
+# Create the database
+postgresql_database node['gitlab']['database']['database'] do
+  connection :host => 'localhost'
+  owner node['gitlab']['database']['username']
   action :create
 end
 
-# Grant all privileges to user on database
-postgresql_database_user database_user do
-  connection database_connection
-  database_name database
-  action :grant
-end
+# FIXME: Add extension resource to postgresql cookbook
+node.force_override['postgresql']['database_name'] = node['gitlab']['database']['database']
+include_recipe 'postgresql::contrib'