wmde-odoo/manifests/init.pp

@@ -129,13 +129,13 @@ inherits odoo::params {
 	}
 
 
+
 	exec {"install_pre":
 		command => "/bin/ls > /dev/null && $preenv && $pip_cmd install -r $odoo_systemdir/requirements.txt",
 		require => [
 			Vcsrepo["$odoo_systemdir"],
 			Package[$prepkg],
-		],
+		]
-		timeout     => 1800,
 	}
 }
 

wmde-odoo/manifests/params.pp

@@ -14,13 +14,6 @@ class odoo::params{
 
 	case  $::osfamily {
 		'FreeBSD':{
-			$postgrespkgs = "postgresql96-server"
-			$postgresuser = "postgres"
-			$postgresdatadir = "/var/db/postgres/data96"
-			$postgresinitcmd = "/usr/local/bin/initdb -D $postgresdatadir"
-			$postgresusercreate = "/usr/local/bin/createuser -S odoo"
-			$postgresuserexists = "/usr/local/bin/psql -t -c '\du' | cut -d \| -f 1 | grep -qw odoo"
-
 			$prepkg = [
 				"cyrus-sasl",
 				"textproc/py-libxml2",

wmde-odoo/manifests/postgres.pp

@@ -1,30 +0,0 @@
-#
-# install postgres
-#
-
-
-class odoo::postgres 
-(
-
-)
-inherits odoo::params 
-
-{
-	package {$postgrespkgs:
-		ensure => installed
-	} ->
-	exec {$postgresinitcmd:
-		user => $postgresuser,
-		creates => $postgresdatadir
-	} ->
-	service {"postgresql":
-		ensure => running
-	} ->
-	exec {$postgresusercreate:
-		user => $postgresuser,
-		unless => $postgresuserexists
-	}
-	
-
-
-}