Fix commiter user
Add ability to create projects from exist config
Change-Id: Ie0fe79279226fb9dc1d046cd0df7fd6176412c54
diff --git a/gerrit/client/project.sls b/gerrit/client/project.sls
index c990687..3f9acf7 100644
--- a/gerrit/client/project.sls
+++ b/gerrit/client/project.sls
@@ -1,13 +1,13 @@
{% from "gerrit/map.jinja" import client with context %}
{%- if client.enabled %}
-/srv/jeepyb/projects.ini:
+{{ client.dir.project_config }}/projects.ini:
file.managed:
- source: salt://gerrit/files/projects.ini
- template: jinja
- require_in:
- cmd: gerrit_client_enforce_projects
-
+{%- if client.dir.project_config == "/srv/jeepyb" %}
/srv/jeepyb/projects.yaml:
file.managed:
- source: salt://gerrit/files/projects.yaml
@@ -34,13 +34,13 @@
#}
{%- endfor %}
-
+{%- endif %}
gerrit_client_enforce_projects:
cmd.run:
- - name: manage-projects -v
+ - name: manage-projects -d -v 2>&1 | tee {{ client.dir.project_config }}/jeepyb.log
- env:
- - PROJECTS_INI: "/srv/jeepyb/projects.ini"
- - PROJECTS_YAML: "/srv/jeepyb/projects.yaml"
+ - PROJECTS_INI: "{{ client.dir.project_config }}/projects.ini"
+ - PROJECTS_YAML: "{{ client.dir.project_config }}/projects.yaml"
- GERRIT_CONFIG: "{{ client.dir.gerrit_config }}"
- GERRIT_SECURE_CONFIG: "{{ client.dir.gerrit_secure_config }}"
diff --git a/gerrit/files/projects.ini b/gerrit/files/projects.ini
index ec1677e..2d1e55a 100644
--- a/gerrit/files/projects.ini
+++ b/gerrit/files/projects.ini
@@ -6,7 +6,7 @@
jeepyb-cache-dir={{ client.dir.cache }}
gerrit-host={{ client.server.host }}
gerrit-user={{ client.server.user }}
-gerrit-committer={{ client.server.email }}
+gerrit-committer={{ client.server.user }} <{{ client.server.email }}>
gerrit-key={{ client.config.key }}
gerrit-replicate={{ client.get('replicate', False) }}
{%- if client.github is defined %}
diff --git a/gerrit/map.jinja b/gerrit/map.jinja
index 310f9ee..61a44fb 100644
--- a/gerrit/map.jinja
+++ b/gerrit/map.jinja
@@ -14,6 +14,7 @@
{%- set server = salt['grains.filter_by'](server_defaults, merge=salt['pillar.get']('gerrit:server')) %}
{%- load_yaml as client_defaults %}
+{% set project_config = pillar.gerrit.get('client', {}).get('dir', {}).get('project_config', '/srv/jeepyb') %}
Debian:
homepage: "http://domain.com/"
source:
@@ -24,10 +25,11 @@
- jeepyb
- curl
dir:
+ project_config: {{ project_config }}
base: /usr/share/jeepyb
- acls: /srv/jeepyb/acls
+ acls: {{ project_config }}/acls
git: /srv/jeepyb/git
- cache: /srv/jeepyb/cache
+ cache: {{ project_config }}/cache
gerrit_config: /home/gerrit2/review_site/etc/gerrit.config
gerrit_secure_config: /home/gerrit2/review_site/etc/secure.config
config: