Merge pull request #7 from kenyon/service-standardoutput-syslog-obsolete

systemd service units: remove obsolete `StandardOutput=syslog`

Author: nmburgan

resources/puppetlabs/lein-ezbake/template/global/ext/debian/ezbake.service.erb

@@ -60,7 +60,5 @@ ExecStartPost=-<%= action %>
 <% end -%>
 SuccessExitStatus=143
 
-StandardOutput=syslog
-
 [Install]
 WantedBy=multi-user.target

resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb

@@ -350,16 +350,27 @@
 shared_opts << "--url http://github.com/openvoxproject"
 shared_opts << "--architecture all"
 
+puts "######## Replaces: #{options.replaces}"
 options.replaces.each do |pkg, version|
   if options.output_type == 'rpm'
-    fpm_opts << "--replaces '#{pkg} <= #{version}-1'"
-    fpm_opts << "--conflicts '#{pkg} <= #{version}-1'"
+    val = if version.nil? || version.empty?
+            "'#{pkg}'"
+          else
+            "'#{pkg} <= #{version}-1'"
+          end
+    fpm_opts << "--replaces #{val}"
+    fpm_opts << "--conflicts #{val}"
   elsif options.output_type == 'deb'
     # why debian, why.
-    fpm_opts << "--replaces '#{pkg} (<< #{version}-1openvox1)'"
-    fpm_opts << "--conflicts '#{pkg} (<< #{version}-1openvox1)'"
-    fpm_opts << "--replaces '#{pkg} (<< #{version}-1#{options.dist})'"
-    fpm_opts << "--conflicts '#{pkg} (<< #{version}-1#{options.dist})'"
+    if version.nil? || version.empty?
+      fpm_opts << "--replaces '#{pkg}'"
+      fpm_opts << "--conflicts '#{pkg}'"
+    else
+      fpm_opts << "--replaces '#{pkg} (<< #{version}-1openvox1)'"
+      fpm_opts << "--conflicts '#{pkg} (<< #{version}-1openvox1)'"
+      fpm_opts << "--replaces '#{pkg} (<< #{version}-1#{options.dist})'"
+      fpm_opts << "--conflicts '#{pkg} (<< #{version}-1#{options.dist})'"
+    end
   end
 end
 

resources/puppetlabs/lein-ezbake/template/global/ext/redhat/ezbake.service.erb

@@ -60,7 +60,5 @@ ExecStartPost=-<%= action %>
 <% end -%>
 SuccessExitStatus=143
 
-StandardOutput=syslog
-
 [Install]
 WantedBy=multi-user.target