[patch] Puppetdb 1.2.0 patch

puppetdb-1.2.0-gentoo-init.patch (text/plain), 6.53 KB, created by Antony perigault on 2013-05-22 13:31:28 UTC

--- puppetdb-1.2.0/tasks/install.rake.old
+++ puppetdb-1.2.0/tasks/install.rake
@@ -62,6 +62,11 @@ task :install => [  JAR_FILE  ] do
     cp_p "ext/files/puppetdb.default", "#{DESTDIR}/etc/default/#{@name}"
     cp_pr "ext/files/#{@name}.debian.init", "#{DESTDIR}/etc/init.d/#{@name}"
     chmod 0755, "#{DESTDIR}/etc/init.d/#{@name}"
+  elsif @osfamily == "linux"
+    mkdir_p "#{DESTDIR}/etc/conf.d"
+    cp_p "ext/files/puppetdb.gentoo.conf", "#{DESTDIR}/etc/conf.d/#{@name}"
+    cp_pr "ext/files/#{@name}.gentoo.init", "#{DESTDIR}/etc/init.d/#{@name}"
+    chmod 0755, "#{DESTDIR}/etc/init.d/#{@name}"
   else
     raise "Unknown or unsupported osfamily: #{@osfamily}"
   end
--- puppetdb-1.2.0/tasks/template.rake.old
+++ puppetdb-1.2.0/tasks/template.rake
@@ -3,45 +3,58 @@
 task :template => [ :clean ] do
    mkdir_p "ext/files/debian"
    # files for deb and rpm
-   erb "ext/templates/log4j.properties.erb", "ext/files/log4j.properties"
-   erb "ext/templates/config.ini.erb" , "ext/files/config.ini"
-   erb "ext/templates/jetty.ini.erb",  "ext/files/jetty.ini"
-   erb "ext/templates/repl.ini.erb",  "ext/files/repl.ini"
-   erb "ext/templates/database.ini.erb",  "ext/files/database.ini"
-   erb "ext/templates/puppetdb-foreground.erb",  "ext/files/puppetdb-foreground"
+
+   def templatizing(source, destination)
+      template_file = File.open(source, 'r').read
+      erb = ERB.new(template_file, nil, '-')
+      File.open(destination, 'w+') { |file| file.write(erb.result(binding)) }
+   end
+
+   templatizing("ext/templates/log4j.properties.erb", "ext/files/log4j.properties")
+
+
+   templatizing("ext/templates/config.ini.erb", "ext/files/config.ini")
+   templatizing("ext/templates/jetty.ini.erb",  "ext/files/jetty.ini")
+   templatizing("ext/templates/repl.ini.erb",  "ext/files/repl.ini")
+   templatizing("ext/templates/database.ini.erb",  "ext/files/database.ini")
+   templatizing("ext/templates/puppetdb-foreground.erb",  "ext/files/puppetdb-foreground")
    chmod 0700, "ext/files/puppetdb-foreground"
-   erb "ext/templates/puppetdb-import.erb",  "ext/files/puppetdb-import"
+   templatizing("ext/templates/puppetdb-import.erb",  "ext/files/puppetdb-import")
    chmod 0700, "ext/files/puppetdb-import"
-   erb "ext/templates/puppetdb-export.erb",  "ext/files/puppetdb-export"
+   templatizing("ext/templates/puppetdb-export.erb",  "ext/files/puppetdb-export")
    chmod 0700, "ext/files/puppetdb-export"
 
    # files for deb
-   erb "ext/templates/init_debian.erb", "ext/files/debian/#{@name}.init"
-   erb "ext/templates/puppetdb_default.erb", "ext/files/debian/#{@name}.default"
-   erb "ext/templates/deb/control.erb", "ext/files/debian/control"
-   erb "ext/templates/deb/prerm.erb", "ext/files/debian/#{@name}.prerm"
-   erb "ext/templates/deb/postrm.erb", "ext/files/debian/#{@name}.postrm"
-   erb "ext/templates/deb/base.install.erb", "ext/files/debian/#{@name}.install"
-   erb "ext/templates/deb/terminus.install.erb", "ext/files/debian/#{@name}-terminus.install"
-   erb "ext/templates/deb/rules.erb", "ext/files/debian/rules"
+   templatizing("ext/templates/init_debian.erb", "ext/files/debian/#{@name}.init")
+   templatizing("ext/templates/puppetdb_default.erb", "ext/files/debian/#{@name}.default")
+   templatizing("ext/templates/deb/control.erb", "ext/files/debian/control")
+   templatizing("ext/templates/deb/prerm.erb", "ext/files/debian/#{@name}.prerm")
+   templatizing("ext/templates/deb/postrm.erb", "ext/files/debian/#{@name}.postrm")
+   templatizing("ext/templates/deb/base.install.erb", "ext/files/debian/#{@name}.install")
+   templatizing("ext/templates/deb/terminus.install.erb", "ext/files/debian/#{@name}-terminus.install")
+   templatizing("ext/templates/deb/rules.erb", "ext/files/debian/rules")
    chmod 0755, "ext/files/debian/rules"
-   erb "ext/templates/deb/changelog.erb", "ext/files/debian/changelog"
-   erb "ext/templates/deb/preinst.erb", "ext/files/debian/#{@name}.preinst"
-   erb "ext/templates/deb/postinst.erb", "ext/files/debian/#{@name}.postinst"
-   erb "ext/templates/logrotate.erb", "ext/files/debian/#{@name}.logrotate"
-   erb "ext/templates/init_debian.erb", "ext/files/#{@name}.debian.init"
+   templatizing("ext/templates/deb/changelog.erb", "ext/files/debian/changelog")
+   templatizing("ext/templates/deb/preinst.erb", "ext/files/debian/#{@name}.preinst")
+   templatizing("ext/templates/deb/postinst.erb", "ext/files/debian/#{@name}.postinst")
+   templatizing("ext/templates/logrotate.erb", "ext/files/debian/#{@name}.logrotate")
+   templatizing("ext/templates/init_debian.erb", "ext/files/#{@name}.debian.init")
    cp_pr FileList["ext/templates/deb/*"], "ext/files/debian"
    cp_pr "ext/templates/puppetdb-ssl-setup", "ext/files"
    chmod 0700, "ext/files/puppetdb-ssl-setup"
    rm_rf FileList["ext/files/debian/*.erb"]
 
    # files for rpm
-   erb "ext/templates/logrotate.erb", "ext/files/puppetdb.logrotate"
-   erb "ext/templates/init_redhat.erb", "ext/files/puppetdb.redhat.init"
-   erb "ext/templates/puppetdb_default.erb", "ext/files/puppetdb.default"
+   templatizing("ext/templates/logrotate.erb", "ext/files/puppetdb.logrotate")
+   templatizing("ext/templates/init_redhat.erb", "ext/files/puppetdb.redhat.init")
+   templatizing("ext/templates/puppetdb_default.erb", "ext/files/puppetdb.default")
 
    # developer utility files for redhat
    mkdir_p "ext/files/dev/redhat"
-   erb "ext/templates/dev/redhat/redhat_dev_preinst.erb", "ext/files/dev/redhat/redhat_dev_preinst"
-   erb "ext/templates/dev/redhat/redhat_dev_postinst.erb", "ext/files/dev/redhat/redhat_dev_postinst"
+   templatizing("ext/templates/dev/redhat/redhat_dev_preinst.erb", "ext/files/dev/redhat/redhat_dev_preinst")
+   templatizing("ext/templates/dev/redhat/redhat_dev_postinst.erb", "ext/files/dev/redhat/redhat_dev_postinst")
+
+   # files for gentoo
+   templatizing("ext/templates/conf_gentoo.erb", "ext/files/puppetdb.gentoo.conf")
+   templatizing("ext/templates/init_gentoo.erb", "ext/files/puppetdb.gentoo.init")
 end
--- puppetdb-1.2.0/tasks/tar.rake.old
+++ puppetdb-1.2.0/tasks/tar.rake
@@ -25,8 +25,8 @@ task :package => [ :clobber, JAR_FILE, :template  ] do
   File.open(File.join(workdir,'version'), File::CREAT|File::TRUNC|File::RDWR, 0644) do |f|
     f.puts @version
   end
-  mv "#{workdir}/ext/files/debian", "#{workdir}/ext"
-  cp_pr "puppet", "#{workdir}/ext/master"
+#  mv "#{workdir}/ext/files/debian", "#{workdir}/ext"
+#  cp_pr "puppet", "#{workdir}/ext/master"
   mkdir_p "pkg"
   pkg_dir = File.expand_path(File.join(".", "pkg"))
   sh "cd #{temp}; tar --exclude=.gitignore --exclude=ext/packaging -zcf #{pkg_dir}/#{@name}-#{@version}.tar.gz #{@name}-#{@version}"