From d73c53cb3e0c5fbc8cf021d1055829fa584a9021 Mon Sep 17 00:00:00 2001
From: Stefan Katzensteiner <stefan.katzensteiner@camadeus.at>
Date: Wed, 4 Nov 2015 13:58:08 +0100
Subject: [PATCH] Updaten init.pp

---
 .gitignore                                  |  1 +
 dev/odoo-server-dev-sk.conf                 |  2 +-
 setup/puppet/modules/odoo/manifests/init.pp | 40 ++++++++++-----------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2375512a..d84e8c08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 .project
 .pydevproject
 .settings
+.idea
diff --git a/dev/odoo-server-dev-sk.conf b/dev/odoo-server-dev-sk.conf
index 337c2e0e..abad481e 100644
--- a/dev/odoo-server-dev-sk.conf
+++ b/dev/odoo-server-dev-sk.conf
@@ -4,7 +4,7 @@ xmlrpc_port = 8080
 ; This is the password that allows database operations:
 ; admin_passwd = admin
 db_host = False
-db_port = 5433
+db_port = 5432
 db_user = False
 db_password = False
 
diff --git a/setup/puppet/modules/odoo/manifests/init.pp b/setup/puppet/modules/odoo/manifests/init.pp
index c948bf43..0a876357 100644
--- a/setup/puppet/modules/odoo/manifests/init.pp
+++ b/setup/puppet/modules/odoo/manifests/init.pp
@@ -44,14 +44,14 @@ class odoo {
         encoding => 'UTF8',
     }
 
-    # workaround for http://projects.puppetlabs.com/issues/4695
-    # when PostgreSQL is installed with SQL_ASCII encoding instead of UTF8
-    exec { 'utf8 postgres':
-       command => 'sudo -u postgres pg_dropcluster --stop 9.3 main ; pg_createcluster --start --locale en_US.UTF-8 9.3 main',
-       unless  => 'sudo -u postgres psql -t -c "\l" | grep template1 | grep -q UTF',
-       require => Class['postgresql::server'],
-       path    => ['/bin', '/sbin', '/usr/bin', '/usr/sbin'],
-    }
+#    # workaround for http://projects.puppetlabs.com/issues/4695
+#    # when PostgreSQL is installed with SQL_ASCII encoding instead of UTF8
+#    exec { 'utf8 postgres':
+#       command => 'sudo -u postgres pg_dropcluster --stop 9.3 main ; pg_createcluster --start --locale en_US.UTF-8 9.3 main',
+#       unless  => 'sudo -u postgres psql -t -c "\l" | grep template1 | grep -q UTF',
+#       require => Class['postgresql::server'],
+#       path    => ['/bin', '/sbin', '/usr/bin', '/usr/sbin'],
+#    }
 
   file { "/var/log/odoo":
       owner => 'root',
@@ -115,19 +115,19 @@ class odoo {
     }
 
 
-	file { 'wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb':
-		name => "/tmp/wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb",
-		owner => root,
-		group => root,
-		source => "puppet:///modules/odoo/wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb"
-	}
+#	file { 'wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb':
+#		name => "/tmp/wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb",
+#		owner => root,
+#		group => root,
+#		source => "puppet:///modules/odoo/wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb"
+#	}
 	
-    package { 'wkhtmltox':
-    	provider => dpkg,
-        ensure => installed,
-        source => "/tmp/wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb",
-        require => [File['wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb'],Package['xfonts-base']],
-    }
+#    package { 'wkhtmltox':
+#    	provider => dpkg,
+#        ensure => installed,
+#        source => "/tmp/wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb",
+#        require => [File['wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb'],Package['xfonts-base']],
+#    }
 
     package {['passlib',
               'psycogreen',