improvements in rpm packaging

* add gcc-c++ to BuildRequires;
* embrace systemd.

Author: Andrei Zavada

rel/files/riak

@@ -28,6 +28,13 @@ function delete_pid_file {
     rm -f $PID_DIR/riak.pid
 }
 
+# prevents centos8 su from contacting pam and printing the "Last logged in" message
+if [ "`cat /etc/redhat-release 2>&1`" = "CentOS Stream release 8" ]; then
+    SU="su --session-command"
+else
+    SU=su
+fi
+
 function maybe_su {
     if [[ $EUID -ne 0 ]]; then
         NODETOOL_NODE_PREFIX=${NODETOOL_NODE_PREFIX} PIPE_DIR=${PIPE_DIR} $*
@@ -39,7 +46,7 @@ function maybe_su {
 NODETOOL_NODE_PREFIX=${NODETOOL_NODE_PREFIX} PIPE_DIR=$PIPE_DIR $*
 EOF
 	chmod +x $f
-	su - riak $f
+	$SU - riak $f
     fi
 }
 

rel/pkg/deb/vars.config

@@ -47,12 +47,6 @@
 {cuttlefish,         "on"}.
 {cuttlefish_conf,    "riak.conf"}.
 
-%%
-%% yokozuna
-%%
-{yz_solr_port, 8093}.
-{yz_solr_jmx_port, 8985}.
-
 %% lager
 {console_log_default, file}.
 

rel/pkg/rpm/init.script

@@ -0,0 +1,14 @@
+[Unit]
+Description=Riak KV Database
+
+[Service]
+User=riak
+ExecStart=/usr/sbin/riak start
+ExecStop=/usr/sbin/riak stop
+Type=forking
+PIDFile=/run/riak/riak.pid
+EnvironmentFile=-/etc/default/riak
+RuntimeDirectory=riak
+
+[Install]
+WantedBy=multi-user.target

rel/pkg/rpm/riak.service

@@ -21,20 +21,22 @@
 Name: riak
 Version: %{_version}
 Release: %{_release}%{?dist}
-License: "Apacke 2.0"
+License: "Apache 2.0"
 Group: Development/Libraries
 Source: %{_tarname}
 URL: "https://riak.com"
 Vendor: "Riak"
 Packager: "Riak Package Maint" <"[email protected]">
 BuildRoot: %{_tmppath}/%{name}-%{_revision}-%{release}-root
 Summary: "Riak is a distributed data store"
-Obsoletes: riak
+BuildRequires: systemd systemd-rpm-macros gcc-c++ pam-devel
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 
 %description
 "Riak is a distributed data store"
 
-%define init_script %{_sysconfdir}/init.d/riak
 %define debug_package %{nil}
 %define __prelink_undo_cmd /bin/cat prelink library
 
@@ -60,26 +62,35 @@ cat > rpm.vars.config <<EOF
 {platform_log_dir,  "%{platform_log_dir}"}.
 EOF
 
+%define _build_id_links none
+
 %build
 make rel-rpm
 
 %install
-%define relpath %{_builddir}/%{buildsubdir}/_build/rpm/rel/riak
+%define relpath %{_builddir}/%{buildsubdir}/rel/riak
 %define buildroot_lib %{buildroot}%{_libdir}/riak
 %define buildroot_etc %{buildroot}%{_sysconfdir}/riak
 %define buildroot_bin %{buildroot_lib}/bin
-
-mkdir -p %{buildroot_etc}
-mkdir -p %{buildroot_lib}
-mkdir -p %{buildroot_bin}
-mkdir -p %{buildroot}%{_sbindir}
-mkdir -p %{buildroot}%{_localstatedir}/lib/riak
-mkdir -p %{buildroot}%{_localstatedir}/log/riak
+%define buildroot_sbin %{buildroot}%{_sbindir}
+%define buildroot_unit %{buildroot}%{_unitdir}
+%define buildroot_run %{buildroot}%{_rundir}
+
+mkdir -p \
+  %{buildroot_etc} \
+  %{buildroot_lib} \
+  %{buildroot_bin} \
+  %{buildroot_sbin} \
+  %{buildroot_unit} \
+  %{buildroot_run}/riak \
+  %{buildroot}%{_localstatedir}/lib/riak \
+  %{buildroot}%{_localstatedir}/log/riak
 
 cp -R %{relpath}/lib       %{buildroot_lib}
 cp -R %{relpath}/erts-*    %{buildroot_lib}
 cp -R %{relpath}/releases  %{buildroot_lib}
 cp -R %{relpath}/share     %{buildroot_lib}
+cp rel/pkg/rpm/%{name}.service %{buildroot_unit}
 
 if [ -d %{relpath}/bin ]; then \
    cd %{relpath}/bin
@@ -90,14 +101,15 @@ fi
 cp %{relpath}/usr/sbin/riak %{buildroot}%{_sbindir}
 cp %{relpath}/etc/riak.conf %{buildroot_etc}
 cp %{relpath}/etc/advanced.config %{buildroot_etc}
+for f in riak-admin riak-repl riak-debug; do
+    cp %{relpath}/bin/$f %{buildroot}%{_sbindir}
+done
+cp %{relpath}/usr/bin/riak %{buildroot}%{_sbindir}
 
 mkdir -p %{buildroot}%{_localstatedir}/lib/riak
 cp -R %{relpath}/data/* \
       %{buildroot}%{_localstatedir}/lib/riak
 
-mkdir -p %{buildroot}%{_sysconfdir}/init.d
-install -m755 %{relpath}/etc/init.d/init.script  %{buildroot}%{_sysconfdir}/init.d/riak
-
 # Needed to work around check-rpaths which seems to be hardcoded into recent
 # RPM releases
 export QA_RPATHS=3
@@ -128,26 +140,32 @@ if [ `which selinuxenabled > /dev/null 2>&1` ] ; then
    selinuxenabled && find %{_localstatedir}/lib/riak -name "*.so" -exec chcon -t textrel_shlib_t {} \;
 fi
 
+%systemd_post %{name}.service
+
 %preun
-# Pre-uninstall script
+%systemd_preun %{name}.service
 
 # Only on uninstall, not upgrades
 if [ "$1" = 0 ] ; then
    /sbin/service riak stop > /dev/null 2>&1
 fi
 exit 0
 
+%postun
+%systemd_postun %{name}.service
 
 # Man pages are optional and might be missing, read from file
 %files
+%defattr(-,root,root)
+%{_libdir}/*
+%{_unitdir}/%{name}.service
+%{_sbindir}/*
+
 %defattr(-,riak,riak)
+%{_sysconfdir}/riak
 %{_localstatedir}/lib/riak
 %{_localstatedir}/log/riak
-%{_libdir}/*
-%defattr(-,root,root)
-%{_sysconfdir}/init.d/riak
-%dir %{_sysconfdir}/riak
-/usr/sbin/*
+
 %config(noreplace) %{_sysconfdir}/riak/*
 
 %clean

rel/pkg/rpm/specfile

@@ -1,6 +1,8 @@
 %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
 %% ex: ft=erlang ts=4 sw=4 et
 
+{rel_vsn, "3.0.9.1"}.
+
 %% Platform-specific installation paths
 {platform_bin_dir,  "/usr/lib64/riak/bin"}.
 {platform_data_dir, "/var/lib/riak"}.
@@ -45,12 +47,6 @@
 {cuttlefish,         "on"}.
 {cuttlefish_conf,    "riak.conf"}.
 
-%%
-%% yokozuna
-%%
-{yz_solr_port, 8093}.
-{yz_solr_jmx_port, 8985}.
-
 %% lager
 {console_log_default, file}.