From 159e50c1472e82f1cc9d84c6a6d829ca3c2b63e3 Mon Sep 17 00:00:00 2001
From: Cristobal Badilla <cbadilla@manta.com>
Date: Thu, 22 Aug 2024 09:29:32 -0400
Subject: [PATCH 1/2] Add: Update ploy publish to include systemd files and
 mount log path

---
 lib/ploy/localpackage/config.rb     |  2 ++
 lib/ploy/localpackage/debbuilder.rb | 28 +++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/lib/ploy/localpackage/config.rb b/lib/ploy/localpackage/config.rb
index 5363d4f..5c40df3 100644
--- a/lib/ploy/localpackage/config.rb
+++ b/lib/ploy/localpackage/config.rb
@@ -14,6 +14,8 @@ def builder
           :branch        => git_branch,
           :timestamp     => git_timestamp,
           :upstart_files => @conf['upstart_files'],
+          :systemd_files => @conf['systemd_files'],
+          :mnt_log_path  => @conf['mnt_log_path'],
           :dist_dirs     => @conf['dist_dirs'],
           :dist_dir      => @conf['dist_dir'],
           :prefix        => @conf['prefix'],
diff --git a/lib/ploy/localpackage/debbuilder.rb b/lib/ploy/localpackage/debbuilder.rb
index 6e2519d..a7d99e7 100644
--- a/lib/ploy/localpackage/debbuilder.rb
+++ b/lib/ploy/localpackage/debbuilder.rb
@@ -10,6 +10,8 @@ class DebBuilder
       attr_accessor :branch
       attr_accessor :timestamp
       attr_accessor :upstart_files
+      attr_accessor :systemd_files
+      attr_accessor :mnt_log_path
       attr_accessor :dist_dirs
       attr_accessor :dist_dir
       attr_accessor :prefix
@@ -35,7 +37,9 @@ def build_deb
             ol = fpm_optlist(dir)
             ol.add("--after-install", file.path)
             #puts "debug: fpm #{ol.as_string} ."
-            info = eval(`fpm #{ol.as_string} .`)
+            output = `fpm #{ol.as_string} .`
+            output = output.gsub("Adding action files", "")
+            info = eval(output)
           end
         end
         return info[:path]
@@ -54,12 +58,20 @@ def fpm_optlist(dir)
           { "-v" => safeversion(@timestamp + '.' + @branch) },
         ]
 
-        if @upstart_files then
+        if @upstart_files && !@systemd_files then
           @upstart_files.each do | upstart |
             optlist.add("--deb-upstart", upstart)
           end
         end
 
+        if @systemd_files then
+          @systemd_files.each do | systemd |
+            optlist.add("--deb-systemd", systemd)
+            optlist.add("--deb-systemd-auto-start", "")
+            optlist.add("--deb-systemd-restart-after-upgrade", "")
+            optlist.add("--deb-systemd-enable", "")
+          end
+        end
         return optlist
       end
 
@@ -90,7 +102,7 @@ def write_after_install_script(file)
 # END PACKAGE POSTINST
 SCRIPT
 
-        if @upstart_files then
+        if @upstart_files && !@systemd_files then
           @upstart_files.each do | upstart |
             service = File.basename(upstart)
             file.write <<SCRIPT
@@ -105,6 +117,16 @@ def write_after_install_script(file)
   stop #{service}
 fi
 start #{service}
+SCRIPT
+          end
+        elsif @systemd_files then
+          @systemd_files.each do | systemd |
+            service = File.basename(systemd)
+            mnt_log = @mnt_log_path ? @mnt_log_path : "/mnt/" + service
+            file.write <<SCRIPT
+# Systemd after script
+mkdir -p #{mnt_log}
+
 SCRIPT
           end
         end

From 1cbc7fc68456908a46728f0fec24cfe9f6abc58c Mon Sep 17 00:00:00 2001
From: Cristobal Badilla <cbadilla@manta.com>
Date: Thu, 22 Aug 2024 14:50:16 -0400
Subject: [PATCH 2/2] Update: Readme

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index b6ec6e3..f7b596d 100644
--- a/README.md
+++ b/README.md
@@ -48,11 +48,16 @@ dist_dirs:
 prep_cmd: lineman build
 upstart_files:
  - conf/some-project-initfile
+systemd_files:
+ - conf/some-project-sysfile
+mnt_log_path: path/to/service/logs
 postinst: |
   # This script will be in /var/lib/dpkg/info/${PACKAGE_NAME}.postinst
   # once the package is installed. Ploy adds #!/bin/bash to the top
   # automatically.
 ```
+**Note:**
+`systemd_files` and `mnt_log_path` are necessary if you want to install the service using systemd. If you don't want to use systemd, you can ignore these fields.
 
 ### metadata files