From dc7405b83933505e4d94e85fa1c37a68c3b15af3 Mon Sep 17 00:00:00 2001
From: James Deathe <james.deathe@gmail.com>
Date: Sat, 20 Jul 2019 15:50:01 +0100
Subject: [PATCH] #199: Updates description in systemd register unit file.

---
 CHANGELOG.md                                                   | 1 +
 .../system/centos-ssh-apache-php-fcgi.register@.service        | 3 ++-
 src/etc/systemd/system/centos-ssh-apache-php-fcgi@.service     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7685b3b..11a87b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ CentOS-6 6.10 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP
 
 ### 1.13.0 - Unreleased
 
+- Updates description in `centos-ssh-apache-php-fcgi.register@.service`.
 - Adds `.env` files to `.gitignore` for exclusion from version control.
 - Removes unused `DOCKER_PORT_MAP_TCP_22` variable from environment includes.
 
diff --git a/src/etc/systemd/system/centos-ssh-apache-php-fcgi.register@.service b/src/etc/systemd/system/centos-ssh-apache-php-fcgi.register@.service
index b2efc2a..5fc25b2 100644
--- a/src/etc/systemd/system/centos-ssh-apache-php-fcgi.register@.service
+++ b/src/etc/systemd/system/centos-ssh-apache-php-fcgi.register@.service
@@ -35,12 +35,13 @@
 #
 # To uninstall:
 #     sudo systemctl disable -f {service-unit-instance-name}
+#     sudo systemctl daemon-reload
 #     sudo rm /etc/systemd/system/{service-unit-template-name}
 #     sudo systemctl daemon-reload
 # ------------------------------------------------------------------------------
 
 [Unit]
-Description=centos-apache-php-fcgi etcd registration // %p@%i
+Description=centos-ssh-apache-php-fcgi etcd registration // %p@%i
 After=etcd.service
 After=etcd2.service
 After={{SERVICE_UNIT_NAME}}@%i.service
diff --git a/src/etc/systemd/system/centos-ssh-apache-php-fcgi@.service b/src/etc/systemd/system/centos-ssh-apache-php-fcgi@.service
index 74adfe3..7988005 100644
--- a/src/etc/systemd/system/centos-ssh-apache-php-fcgi@.service
+++ b/src/etc/systemd/system/centos-ssh-apache-php-fcgi@.service
@@ -50,7 +50,6 @@ After=docker.service
 Restart=on-failure
 RestartSec=30
 TimeoutStartSec=1200
-Environment="DOCKER_USER=jdeathe"
 Environment="DOCKER_CONTAINER_OPTS="
 Environment="DOCKER_IMAGE_PACKAGE_PATH=/var/opt/scmi/packages"
 Environment="DOCKER_IMAGE_NAME=centos-ssh-apache-php-fcgi"
@@ -58,6 +57,7 @@ Environment="DOCKER_IMAGE_TAG={{RELEASE_VERSION}}"
 Environment="DOCKER_PORT_MAP_TCP_80=8080"
 Environment="DOCKER_PORT_MAP_TCP_443=9443"
 Environment="DOCKER_PORT_MAP_TCP_8443=NULL"
+Environment="DOCKER_USER=jdeathe"
 Environment="APACHE_AUTOSTART_HTTPD_BOOTSTRAP=true"
 Environment="APACHE_AUTOSTART_HTTPD_WRAPPER=true"
 Environment="APACHE_CONTENT_ROOT=/var/www/app"