From 52cb8459367df84d17a33c9886d3dc9fa96996ad Mon Sep 17 00:00:00 2001 From: Tobias Herre Date: Fri, 4 Dec 2020 09:09:44 +0100 Subject: [PATCH] use wmde8.0 branch from srcsrv.wikimedia.de --- wmde-odoo/manifests/init.pp | 7 +++++-- wmde-odoo/manifests/params.pp | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/wmde-odoo/manifests/init.pp b/wmde-odoo/manifests/init.pp index d6048b2..2be1323 100644 --- a/wmde-odoo/manifests/init.pp +++ b/wmde-odoo/manifests/init.pp @@ -46,7 +46,10 @@ class odoo( - $version = "8.0" + $version = "wmde8.0", + $source = 'https://srcsrv.wikimedia.de/WMDE/odoo.git' +# $source = 'https://www.github.com/odoo/odoo.git' + ) inherits odoo::params { @@ -84,7 +87,7 @@ inherits odoo::params { vcsrepo { "$odoo_systemdir": ensure => present, provider => git, - source => 'https://www.github.com/odoo/odoo.git', + source => $source, revision => $version, # submodules => false, depth => 1, diff --git a/wmde-odoo/manifests/params.pp b/wmde-odoo/manifests/params.pp index 8cc00c5..c99482f 100644 --- a/wmde-odoo/manifests/params.pp +++ b/wmde-odoo/manifests/params.pp @@ -25,8 +25,8 @@ class odoo::params{ "libxslt", "openldap-client", ] - $pip_cmd = "/usr/local/bin/pip" - $preenv = "export CC=gcc && export C_INCLUDE_PATH=/usr/local/include/libxml2:/usr/local/include/sasl" + $pip_cmd = "/usr/local/bin/pip-2.7" + $preenv = "export CC=gcc && export C_INCLUDE_PATH=/usr/local/include/libxml2:/usr/local/include/sasl:/usr/local/include" $conffile = "/usr/local/etc/odoo-server.conf" }