From 2da83cc01705d0e844de5d4e0077cda0da25b04d Mon Sep 17 00:00:00 2001 From: oonska Date: Wed, 7 Jun 2017 23:20:30 +0000 Subject: [PATCH 1/3] Fix systemd service not tracking gerrit process --- gerrit/files/gerrit.service | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gerrit/files/gerrit.service b/gerrit/files/gerrit.service index ea13471..c08b0e0 100644 --- a/gerrit/files/gerrit.service +++ b/gerrit/files/gerrit.service @@ -4,4 +4,6 @@ Description={{service_name}} [Service] ExecStart={{directory}}/bin/gerrit.sh start ExecStop={{directory}}/bin/gerrit.sh stop +PIDFile={{directory}}/logs/gerrit.pid +Type=forking User={{user}} \ No newline at end of file From 1d87d6eb60c749395440909b3b29b374bde46f7e Mon Sep 17 00:00:00 2001 From: Thomas McMurphy Date: Wed, 19 Jul 2017 22:33:19 +0000 Subject: [PATCH 2/3] Fix systemd service timing out due to 'gerrit.sh start' behaviour --- gerrit/files/gerrit.service | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gerrit/files/gerrit.service b/gerrit/files/gerrit.service index c08b0e0..2488bb1 100644 --- a/gerrit/files/gerrit.service +++ b/gerrit/files/gerrit.service @@ -2,8 +2,5 @@ Description={{service_name}} [Service] -ExecStart={{directory}}/bin/gerrit.sh start -ExecStop={{directory}}/bin/gerrit.sh stop -PIDFile={{directory}}/logs/gerrit.pid -Type=forking +ExecStart={{directory}}/bin/gerrit.sh run User={{user}} \ No newline at end of file From 3a55a1031aa2a1ca384e2bfd983e3af500648455 Mon Sep 17 00:00:00 2001 From: Thomas McMurphy Date: Wed, 19 Jul 2017 22:34:17 +0000 Subject: [PATCH 3/3] Fix plugins not installing when hash isn't provided --- gerrit/install.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gerrit/install.sls b/gerrit/install.sls index 537e809..a60ff97 100644 --- a/gerrit/install.sls +++ b/gerrit/install.sls @@ -60,6 +60,8 @@ install_{{ name }}_plugin: - source: {{ plugin.source }} {% if plugin.source_hash is defined %} - source_hash: {{ plugin.source_hash }} +{% else %} + - skip_verify: True {% endif %} - user: {{ settings.user }} - group: {{ settings.group }}