Open Build Service

rubygem-mail_agent.changes Changed

rubygem-mail_agent.spec Changed

@@ -14,6 +14,7 @@
 Source2:        mail_agent.tempfiles
 Source3:        tomte.yml
 Source4:        mail_agent.yml
+Source5:        system-user-mail_agent.conf
 BuildRequires:  ruby-macros >= 5
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  %{ruby >= 1.9}
@@ -28,6 +29,7 @@
 Summary:  Mail Database Agent
 Group:    System/Daemons
 Requires: rubygem(%{mod_name}) = %{version}
+%sysusers_requires
 
 %description -n mail_agent
 Mail agent DB provisioning agent
@@ -35,6 +37,7 @@
 %prep
 
 %build
+%sysusers_generate_pre %{SOURCE5} mail_agent system-user-mail_agent.conf
 
 %install
 %gem_install -f --symlink-binaries --no-ri --no-rdoc
@@ -43,6 +46,8 @@
 install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/mail_agent.service
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/mail_agent/tomte.yml
 install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/mail_agent/mail_agent.yml
+install -D -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/mail_agent-user.conf
+
 install -d %{buildroot}%{_sbindir}
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcmail_agent
 
@@ -55,6 +60,7 @@
 %dir %{_sysconfdir}/mail_agent
 %config(noreplace) %{_sysconfdir}/mail_agent/mail_agent.yml
 %config(noreplace) %{_sysconfdir}/mail_agent/tomte.yml
+%{_sysusersdir}/mail_agent-user.conf
 
 %attr(0700, mail_agent, mail_agent) %dir %{_localstatedir}/lib/mail_agent
 
@@ -64,9 +70,7 @@
 %{_sbindir}/rcmail_agent
 
 
-%pre -n mail_agent
-%{_bindir}/getent group  mail_agent >/dev/null || %{_sbindir}/groupadd -r mail_agent
-%{_bindir}/getent passwd mail_agent >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/tomte -s /bin/false -c "intercom mail policyd" -g mail_agent mail_agent
+%pre -n mail_agent -f mail_agent.pre
 %service_add_pre mail_agent.service
 exit 0

system-user-mail_agent.conf Added

Changes of Revision 24