From 0611645ef02750c1719b30e0bbaa88b98c64f959 Mon Sep 17 00:00:00 2001
From: AJ ONeal <aj@daplie.com>
Date: Tue, 7 Nov 2017 15:54:59 -0700
Subject: [PATCH 1/3] adjust tmpfiles.d

---
 README.md                           | 2 +-
 dist/etc/tmpfiles.d/goldilocks.conf | 7 +------
 installer/install.sh                | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 747b1b6..aa69a32 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ npm install -g goldilocks@v1
 ### Uninstall
 
 ```
-rm -rf /srv/goldilocks/ /var/goldilocks/ /etc/goldilocks/ /opt/goldilocks/ /var/log/goldilocks/ /etc/tmpfiles.d/goldilocks.service /etc/systemd/system/goldilocks.service
+rm -rf /srv/goldilocks/ /var/goldilocks/ /etc/goldilocks/ /opt/goldilocks/ /var/log/goldilocks/ /etc/tmpfiles.d/goldilocks.service /etc/systemd/system/goldilocks.service /etc/ssl/goldilocks
 ```
 
 Usage
diff --git a/dist/etc/tmpfiles.d/goldilocks.conf b/dist/etc/tmpfiles.d/goldilocks.conf
index 1da9677..0d9c677 100644
--- a/dist/etc/tmpfiles.d/goldilocks.conf
+++ b/dist/etc/tmpfiles.d/goldilocks.conf
@@ -2,9 +2,4 @@
 # See https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html
 
 # Type Path           Mode UID      GID      Age Argument
-#d /etc/goldilocks          0755 MY_USER MY_GROUP -   -
-#d /opt/goldilocks          0775 MY_USER MY_GROUP -   -
-#d /srv/www                 0775 MY_USER MY_GROUP -   -
-#d /etc/ssl/goldilocks      0750 MY_USER MY_GROUP -   -
-#d /var/log/goldilocks      0750 MY_USER MY_GROUP -   -
-d /run/goldilocks          0755 MY_USER MY_GROUP -   -
+d /run/goldilocks     0755 MY_USER  MY_GROUP -   -
diff --git a/installer/install.sh b/installer/install.sh
index 7ad9fdf..cb440ed 100644
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -149,4 +149,4 @@ echo "Restart: systemctl restart $my_name"
 echo "Logs: journalctl -xefu $my_name"
 echo "Config: /etc/$my_name/$my_name.yml"
 echo ""
-echo "Unistall: rm -rf /srv/$my_name/ /var/$my_name/ /etc/$my_name/ /opt/$my_name/ /var/log/$my_name/ /etc/tmpfiles.d/$my_name.service /etc/systemd/system/$my_name.service"
+echo "Unistall: rm -rf /srv/$my_name/ /var/$my_name/ /etc/$my_name/ /opt/$my_name/ /var/log/$my_name/ /etc/tmpfiles.d/$my_name.service /etc/systemd/system/$my_name.service /etc/ssl/$my_name"

From 4baf475e354d5390cf0ff649962fed465c1044a3 Mon Sep 17 00:00:00 2001
From: AJ ONeal <aj@daplie.com>
Date: Tue, 7 Nov 2017 15:56:09 -0700
Subject: [PATCH 2/3] adjust logs

---
 installer/install-for-systemd.sh | 5 ++++-
 installer/install.sh             | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/installer/install-for-systemd.sh b/installer/install-for-systemd.sh
index 944823d..1aab34f 100644
--- a/installer/install-for-systemd.sh
+++ b/installer/install-for-systemd.sh
@@ -22,6 +22,7 @@ $sudo_cmd systemctl daemon-reload
 $sudo_cmd systemctl start "${my_app_name}.service"
 $sudo_cmd systemctl enable "${my_app_name}.service"
 
+echo ""
 echo ""
 echo "Fun systemd commands to remember:"
 echo "  $sudo_cmd systemctl daemon-reload"
@@ -29,4 +30,6 @@ echo "  $sudo_cmd systemctl restart $my_app_name.service"
 echo ""
 echo "$my_app_name started with systemctl, check its status like so:"
 echo "  $sudo_cmd systemctl status $my_app_name"
-echo "  $sudo_cmd journalctl -xe -u $my_app_name"
+echo "  $sudo_cmd journalctl -xefu $my_app_name"
+echo ""
+echo ""
diff --git a/installer/install.sh b/installer/install.sh
index cb440ed..a2c0f8e 100644
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -145,8 +145,7 @@ find $my_root/opt/$my_name -type d -exec $sudo_cmd chmod ug+s {} \;
 echo ""
 echo "$my_name installation complete!"
 echo ""
-echo "Restart: systemctl restart $my_name"
-echo "Logs: journalctl -xefu $my_name"
-echo "Config: /etc/$my_name/$my_name.yml"
+echo ""
+echo "Update the config at: /etc/$my_name/$my_name.yml"
 echo ""
 echo "Unistall: rm -rf /srv/$my_name/ /var/$my_name/ /etc/$my_name/ /opt/$my_name/ /var/log/$my_name/ /etc/tmpfiles.d/$my_name.service /etc/systemd/system/$my_name.service /etc/ssl/$my_name"

From ce31c2c02d55b1b048ef3142a65eb2206aea2ff0 Mon Sep 17 00:00:00 2001
From: AJ ONeal <aj@daplie.com>
Date: Tue, 7 Nov 2017 15:58:57 -0700
Subject: [PATCH 3/3] correct which files to remove

---
 README.md            | 2 +-
 installer/install.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index aa69a32..885e6d7 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ npm install -g goldilocks@v1
 ### Uninstall
 
 ```
-rm -rf /srv/goldilocks/ /var/goldilocks/ /etc/goldilocks/ /opt/goldilocks/ /var/log/goldilocks/ /etc/tmpfiles.d/goldilocks.service /etc/systemd/system/goldilocks.service /etc/ssl/goldilocks
+rm -rf /srv/goldilocks/ /var/goldilocks/ /etc/goldilocks/ /opt/goldilocks/ /var/log/goldilocks/ /etc/tmpfiles.d/goldilocks.conf /etc/systemd/system/goldilocks.service /etc/ssl/goldilocks
 ```
 
 Usage
diff --git a/installer/install.sh b/installer/install.sh
index a2c0f8e..7f8086e 100644
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -148,4 +148,4 @@ echo ""
 echo ""
 echo "Update the config at: /etc/$my_name/$my_name.yml"
 echo ""
-echo "Unistall: rm -rf /srv/$my_name/ /var/$my_name/ /etc/$my_name/ /opt/$my_name/ /var/log/$my_name/ /etc/tmpfiles.d/$my_name.service /etc/systemd/system/$my_name.service /etc/ssl/$my_name"
+echo "Unistall: rm -rf /srv/$my_name/ /var/$my_name/ /etc/$my_name/ /opt/$my_name/ /var/log/$my_name/ /etc/tmpfiles.d/$my_name.conf /etc/systemd/system/$my_name.service /etc/ssl/$my_name"