From 95f2e87e138e4526f292f211445d6ecd28ba1314 Mon Sep 17 00:00:00 2001 From: Paladox none Date: Tue, 21 Mar 2017 23:06:31 +0000 Subject: [PATCH] Add the new gerrit systemctl file to init Change-Id: I899c011a921b5c75fe7c05c59724408b0ba92b3d (cherry picked from commit e295e3a4151cfc043c7d1fa2b245a157f4383988) --- .../java/com/google/gerrit/pgm/init/SitePathInitializer.java | 4 ++++ .../main/java/com/google/gerrit/server/config/SitePaths.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java index 0bd5c06a2d..55bffafc7a 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java @@ -98,6 +98,10 @@ public class SitePathInitializer { extract(site.gerrit_sh, getClass(), "gerrit.sh"); chmod(0755, site.gerrit_sh); + extract(site.gerrit_service, getClass(), "gerrit.service"); + chmod(0755, site.gerrit_service); + extract(site.gerrit_service, getClass(), "gerrit.socket"); + chmod(0755, site.gerrit_socket); chmod(0700, site.tmp_dir); extractMailExample("Abandoned.soy"); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java index a810077ab8..6bb9eaeb58 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java @@ -46,6 +46,8 @@ public final class SitePaths { public final Path index_dir; public final Path gerrit_sh; + public final Path gerrit_service; + public final Path gerrit_socket; public final Path gerrit_war; public final Path gerrit_config; @@ -85,6 +87,8 @@ public final class SitePaths { index_dir = p.resolve("index"); gerrit_sh = bin_dir.resolve("gerrit.sh"); + gerrit_service = bin_dir.resolve("gerrit.service"); + gerrit_socket = bin_dir.resolve("gerrit.socket"); gerrit_war = bin_dir.resolve("gerrit.war"); gerrit_config = etc_dir.resolve("gerrit.config");