From 93c22cca6428d106acdf2dec877d6d984d220f41 Mon Sep 17 00:00:00 2001
From: Mihail Radkov <mihail.radkov@ontotext.com>
Date: Tue, 23 Jul 2024 13:33:04 +0300
Subject: [PATCH] GDB-10540: Renamed proxy service name

- Renamed `graphdb_cluster_proxy` service to `graphdb-cluster-proxy`
  for consistency with the rest of our VMs
- Provisioned `/etc/graphdb-cluster-proxy/graphdb-cluster-proxy.env`
---
 CHANGELOG.md                                                | 5 +++++
 README.md                                                   | 6 +++---
 build.pkr.hcl                                               | 4 ++--
 ...{graphdb_cluster_proxy.env => graphdb-cluster-proxy.env} | 0
 ..._cluster_proxy.service => graphdb-cluster-proxy.service} | 2 +-
 files/install_graphdb.sh                                    | 3 ++-
 6 files changed, 13 insertions(+), 7 deletions(-)
 rename files/{graphdb_cluster_proxy.env => graphdb-cluster-proxy.env} (100%)
 rename files/{graphdb_cluster_proxy.service => graphdb-cluster-proxy.service} (80%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b82da92..db1e9b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to the Packer configuration for creating GraphDB Google Cloud VM images will be documented in this file.
 
+## 1.0.1
+
+- Renamed `graphdb_cluster_proxy` service to `graphdb-cluster-proxy` for consistency with the rest of our VMs
+- Provisioned `/etc/graphdb-cluster-proxy/graphdb-cluster-proxy.env`
+
 ## 1.0.0
 
 - Initial release of the Packer configuration
diff --git a/README.md b/README.md
index 207d657..f1783e9 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ systemctl restart graphdb.service
 ## GraphDB Cluster Proxy
 
 By default, the VM will start only the GraphDB systemd service `graphdb.service` on port `7200`. The image has a second systemd service
-definition `graphdb_cluster_proxy.service` for a second GraphDB process in cluster proxy mode on port `7201`.
+definition `graphdb-cluster-proxy.service` for a second GraphDB process in cluster proxy mode on port `7201`.
 
 This proxy is used in the clustered setup of GraphDB, see https://graphdb.ontotext.com/documentation/10.7/cluster-basics.html for more
 information.
@@ -99,8 +99,8 @@ information.
 To start the cluster proxy process, use:
 
 ```shell
-systemctl enable graphdb_cluster_proxy.service
-systemctl start graphdb_cluster_proxy.service
+systemctl enable graphdb-cluster-proxy.service
+systemctl start graphdb-cluster-proxy.service
 ```
 
 ## Support
diff --git a/build.pkr.hcl b/build.pkr.hcl
index 1f26c2b..c8fd64a 100644
--- a/build.pkr.hcl
+++ b/build.pkr.hcl
@@ -8,8 +8,8 @@ build {
       "./files/google-cloud-ops-agent-config.yaml",
       "./files/graphdb.env",
       "./files/graphdb.service",
-      "./files/graphdb_cluster_proxy.env",
-      "./files/graphdb_cluster_proxy.service",
+      "./files/graphdb-cluster-proxy.env",
+      "./files/graphdb-cluster-proxy.service",
       "./files/install_graphdb.sh"
     ]
     destination = "/tmp/"
diff --git a/files/graphdb_cluster_proxy.env b/files/graphdb-cluster-proxy.env
similarity index 100%
rename from files/graphdb_cluster_proxy.env
rename to files/graphdb-cluster-proxy.env
diff --git a/files/graphdb_cluster_proxy.service b/files/graphdb-cluster-proxy.service
similarity index 80%
rename from files/graphdb_cluster_proxy.service
rename to files/graphdb-cluster-proxy.service
index be134a1..ddf493a 100644
--- a/files/graphdb_cluster_proxy.service
+++ b/files/graphdb-cluster-proxy.service
@@ -8,7 +8,7 @@ Restart=on-failure
 RestartSec=5s
 User=graphdb
 Group=graphdb
-EnvironmentFile=/etc/graphdb/graphdb_cluster_proxy.env
+EnvironmentFile=/etc/graphdb-cluster-proxy/graphdb-cluster-proxy.env
 ExecStart="/opt/graphdb/bin/cluster-proxy"
 TimeoutSec=120
 SuccessExitStatus=143
diff --git a/files/install_graphdb.sh b/files/install_graphdb.sh
index f144839..c6e34da 100644
--- a/files/install_graphdb.sh
+++ b/files/install_graphdb.sh
@@ -70,6 +70,7 @@ mv graphdb-"${GRAPHDB_VERSION}" /opt/graphdb-"${GRAPHDB_VERSION}"
 ln -s /opt/graphdb-"${GRAPHDB_VERSION}" /opt/graphdb
 
 mv /tmp/graphdb.env /etc/graphdb/graphdb.env
+mv /tmp/graphdb-cluster-proxy.env /etc/graphdb-cluster-proxy/graphdb-cluster-proxy.env
 
 chown -R graphdb:graphdb /etc/graphdb \
                          /etc/graphdb-cluster-proxy \
@@ -78,7 +79,7 @@ chown -R graphdb:graphdb /etc/graphdb \
                          /var/opt/graphdb
 
 mv /tmp/graphdb.service /lib/systemd/system/graphdb.service
-mv /tmp/graphdb_cluster_proxy.service /lib/systemd/system/graphdb_cluster_proxy.service
+mv /tmp/graphdb-cluster-proxy.service /lib/systemd/system/graphdb-cluster-proxy.service
 
 systemctl daemon-reload
 systemctl enable graphdb.service