Commit 34419064 authored by Kirill Smelkov's avatar Kirill Smelkov

gitlab: Determine current slapuserX in instance

This user will need to be specified several times in configuration
files, as by default gitlab uses 'git' user and does "sudo" to it if it
is not current.

We will use {{ backend_info.user }} in the upcoming patches.

/cc @kazuhiko, @jerome
parent 93362a08
...@@ -47,6 +47,13 @@ cert = ${slap-connection:cert-file} ...@@ -47,6 +47,13 @@ cert = ${slap-connection:cert-file}
# for convenience
[backend-info]
# current slapuserX
user = {{ pwd.getpwuid(os.getuid())[0] }}
############################# #############################
# GitLab instance setup # # GitLab instance setup #
############################# #############################
...@@ -132,6 +139,7 @@ import-list = ...@@ -132,6 +139,7 @@ import-list =
context = context =
raw autogenerated # This file was autogenerated. (DO NOT EDIT - changes will be lost) raw autogenerated # This file was autogenerated. (DO NOT EDIT - changes will be lost)
section instance_parameter instance-parameter section instance_parameter instance-parameter
section backend_info backend-info
import urlparse urlparse import urlparse urlparse
${:context-extra} ${:context-extra}
context-extra = context-extra =
......
...@@ -20,6 +20,9 @@ mode = 0644 ...@@ -20,6 +20,9 @@ mode = 0644
template= ${instance-gitlab.cfg.in:target} template= ${instance-gitlab.cfg.in:target}
rendered= $${buildout:directory}/instance-gitlab.cfg rendered= $${buildout:directory}/instance-gitlab.cfg
context = context =
import os os
import pwd pwd
key eggs_directory buildout:eggs-directory key eggs_directory buildout:eggs-directory
key develop_eggs_directory buildout:develop-eggs-directory key develop_eggs_directory buildout:develop-eggs-directory
raw gitlab_repository_location ${gitlab-repository:location} raw gitlab_repository_location ${gitlab-repository:location}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment