Fix the base_path

kindredgroup · Dec 1, 2014 · b87ff75 · b87ff75
1 parent 72ab532
commit b87ff75
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -40,10 +40,17 @@
   $url,
   $private_token,
   $ssl_verify     = true,
-  $timeout        = 5
+  $timeout        = 5,
+  $is_base_path   = false
 ) {
 
-  file { "$path/.python-gitlab.cfg":
+  if $is_base_path {
+    $cfg_path = "${path}/${name}"
+  } else {
+    $cfg_path = $path
+  }
+
+  file { "${cfg_path}/.python-gitlab.cfg":
     owner => $name,
     mode  => 0400,
     content => template("${module_name}/python-gitlab.cfg.erb"),

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -37,6 +37,7 @@
 #
 class gitlab_cli(
   $base_path      = $::gitlab_cli::params::base_path,
+  $path           = $::gitlab_cli::params::path,
   $owner          = $::gitlab_cli::params::owner,
   $url            = $::gitlab_cli::params::url,
   $private_token  = $::gitlab_cli::params::private_token,
@@ -46,11 +47,20 @@
 
   python::pip { 'python-gitlab' : } ->
   gitlab_cli::config { $owner:
-    path          => "${base_path}/${name}",
     url           => $url,
     private_token => $private_token,
     ssl_verify    => $ssl_verify,
     timeout       => $timeout
   }
 
+  if $base_path != 'UNDEF' {
+    Gitlab_cli::Config[$owner] {
+      path         => $base_path,
+      is_base_path => true
+    }
+  } else {
+    Gitlab_cli::Config[$owner] {
+      path         => $path
+    }
+  }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -36,6 +36,7 @@
 # Copyright 2014 North Development AB
 #
 class gitlab_cli::params {
+  $base_path      = 'UNDEF'
   $path           = '/root'
   $user           = 'root'
   $private_token  = 'XXXX'

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "unibet-gitlab_cli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "author": "unibet",
   "summary": "Install and configure python-gitlab cli",
   "license": "Apache 2.0",