Open Build Service

rubygem-vhosts_provisioner.changes Changed

rubygem-vhosts_provisioner.spec Changed

@@ -17,6 +17,7 @@
 Source5:        tomte.yml
 Source6:        vhosts_provisioner.yml
 Source7:        gem2rpm.yml
+Source8:        vhosts_provisioner.sysusers
 BuildRequires:  ruby-macros >= 5
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  %{ruby >= 1.9}
@@ -34,9 +35,10 @@
 Summary:        Vhosts provisioner agent
 License:        Apache-2.0
 Group:          Development/Languages/Ruby
-Requires:       rubygem(ruby:2.5.0:vhosts_provisioner) = %{package_version}
-Requires:       rubygem(ruby:2.5.0:bender-vhng)
+Requires:       rubygem(ruby:%{rb_ver}:vhosts_provisioner) = %{package_version}
+Requires:       rubygem(ruby:%{rb_ver}:bender-vhng)
 Requires:       sudo
+%sysusers_requires
 
 %description -n vhosts_provisioner
 Yggdra Agent for vhost provisioning and configuration
@@ -45,17 +47,19 @@
 
 
 %build
+%sysusers_generate_pre %{SOURCE8} vhosts_provisioner vhosts_provisioner.conf
 
 
 %install
 %gem_install -f --symlink-binaries --no-ri --no-rdoc
-install -d -m 0644 %{buildroot}%{_localstatedir}/lib/vhosts_provisioner
+install -d -m 0750 %{buildroot}%{_localstatedir}/lib/vhosts_provisioner
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/vhosts_provisioner
 install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/vhosts_provisioner.service
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sudoers.d/vhosts_provisioner
 install -D -m 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/vhosts_provisioner.conf
 install -D -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/vhosts_provisioner/tomte.yml
 install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/vhosts_provisioner/vhosts_provisioner.yml
+install -D -m 0644 %{SOURCE8} %{buildroot}%{_sysusersdir}/vhosts_provisioner.conf
 install -d -m 0755 %{buildroot}%{_sbindir}
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcvhosts_provisioner
 
@@ -75,27 +79,24 @@
 
 %{_unitdir}/vhosts_provisioner.service
 %{_tmpfilesdir}/vhosts_provisioner.conf
+%{_sysusersdir}/vhosts_provisioner.conf
 
 %{_sbindir}/rcvhosts_provisioner
 
 
-%pre -n vhosts_provisioner
-%{_bindir}/getent group  vhng >/dev/null || %{_sbindir}/groupadd -r vhng
-%{_bindir}/getent passwd vhng >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/vhosts_provisioner -s /bin/false -c "vhng tomte agent" -g vhng vhng
+
+
+%pre -n vhosts_provisioner -f vhosts_provisioner.pre
 %service_add_pre vhosts_provisioner.service
-exit 0
 
 %preun -n vhosts_provisioner
 %service_del_preun vhosts_provisioner.service
-exit 0
 
 %post -n vhosts_provisioner
 %tmpfiles_create %_tmpfilesdir/vhosts_provisioner.conf
 %service_add_post vhosts_provisioner.service
-exit 0
 
 %postun -n vhosts_provisioner
 %service_del_postun vhosts_provisioner.service
-exit 0
 
 %changelog

vhosts_provisioner.sysusers Added

Changes of Revision 7