Skip to content

Z
z-push
Commit 4a4b396f authored by Manfred Kutas's avatar Manfred Kutas
Browse files
Options

Merge pull request #634 in ZP/z-push from... 

Merge pull request #634 in ZP/z-push from bugfix/ZP-1331-create-z-push-group-for-rpm-packages to develop

* commit 'ebd3deef':
  ZP-1331 Use z-push as default group for config files and directories.
  ZP-1331 Added pre and postun directives.
parents fe50c33d ebd3deef
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 77 deletions
build/rpm/z-push.spec
View file @ 4a4b396f
......@@ -38,10 +38,12 @@ Requires: php-soap
Requires: php-mbstring
%if 0%{?suse_version}
Requires: php-posix
Requires(pre): shadow
%else
Requires: php-process
%endif
%endif
Requires(pre): %_sbindir/groupadd
%description -n %name-common
Z-push is an implementation of the ActiveSync protocol which is used 'over-the-air' for multi platform ActiveSync devices. Devices supported are including Windows Mobile, Android, iPhone, and Nokia. With Z-push any groupware can be connected and synced with these devices.
......@@ -400,6 +402,13 @@ install -Dpm 644 config/nginx/z-push.conf "$b/%_sysconfdir/nginx/sites-available
mkdir -p "$b/%_mandir/man1"
cp man/*.1 "$b/%_mandir/man1"
%pre -n %name-common
%_bindir/getent group z-push > /dev/null || %_sbindir/groupadd -r z-push
%_bindir/getent passwd apache > /dev/null && %_sbindir/usermod -a -G z-push apache
%_bindir/getent passwd wwwrun > /dev/null && %_sbindir/usermod -a -G z-push wwwrun
%_bindir/getent passwd nginx > /dev/null && %_sbindir/usermod -a -G z-push nginx
exit 0
%post -n %name-config-apache
%if 0%{?suse_version}
service apache2 reload || true
......@@ -440,13 +449,8 @@ service nginx reload || true
%defattr(-, root, root)
%dir %_sysconfdir/z-push
%if 0%{?suse_version}
%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/policies.ini
%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/z-push.conf.php
%else
%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/policies.ini
%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/z-push.conf.php
%endif
%config(noreplace) %attr(0640,root,z-push) %_sysconfdir/z-push/policies.ini
%config(noreplace) %attr(0640,root,z-push) %_sysconfdir/z-push/z-push.conf.php
%config(noreplace) %attr(0640,root,root) %_sysconfdir/logrotate.d/z-push.lr
......@@ -459,11 +463,11 @@ service nginx reload || true
%doc src/LICENSE
%if 0%{?suse_version}
%attr(750,wwwrun,www) %dir %_localstatedir/lib/z-push
%attr(750,wwwrun,www) %dir %_localstatedir/log/z-push
%attr(770,wwwrun,z-push) %dir %_localstatedir/lib/z-push
%attr(770,wwwrun,z-push) %dir %_localstatedir/log/z-push
%else
%attr(750,apache,apache) %dir %_localstatedir/lib/z-push
%attr(750,apache,apache) %dir %_localstatedir/log/z-push
%attr(750,apache,z-push) %dir %_localstatedir/lib/z-push
%attr(750,apache,z-push) %dir %_localstatedir/log/z-push
%endif
%_bindir/z-push-admin
......@@ -479,11 +483,7 @@ service nginx reload || true
%dir %zpush_dir/backend/caldav
%zpush_dir/backend/caldav/
%dir %_sysconfdir/z-push
%if 0%{?suse_version}
%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/caldav.conf.php
%else
%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/caldav.conf.php
%endif
%config(noreplace) %attr(0640,root,z-push) %_sysconfdir/z-push/caldav.conf.php
# CARDDAV
%files -n %name-backend-carddav
......@@ -492,11 +492,7 @@ service nginx reload || true
%dir %zpush_dir/backend/carddav
%zpush_dir/backend/carddav/
%dir %_sysconfdir/z-push
%if 0%{?suse_version}
%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/carddav.conf.php
%else
%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/carddav.conf.php
%endif
%config(noreplace) %attr(0640,root,z-push) %_sysconfdir/z-push/carddav.conf.php
# COMBINED
%files -n %name-backend-combined
......@@ -505,11 +501,7 @@ service nginx reload || true
%dir %zpush_dir/backend/combined
%zpush_dir/backend/combined/
%dir %_sysconfdir/z-push
%if 0%{?suse_version}
%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/combined.conf.php
%else
%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/combined.conf.php
%endif
%config(noreplace) %attr(0640,root,z-push) %_sysconfdir/z-push/combined.conf.php
# IMAP
%files -n %name-backend-imap
......@@ -518,11 +510,7 @@ service nginx reload || true
%dir %zpush_dir/backend/imap
%zpush_dir/backend/imap/
%dir %_sysconfdir/z-push
%if 0%{?suse_version}
%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/imap.conf.php
%else
%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/imap.conf.php
%endif
%config(noreplace) %attr(0640,root,z-push) %_sysconfdir/z-push/imap.conf.php
# LDAP
%files -n %name-backend-ldap
......@@ -531,11 +519,7 @@ service nginx reload || true
%dir %zpush_dir/backend/ldap
%zpush_dir/backend/ldap/
%dir %_sysconfdir/z-push
%if 0%{?suse_version}
%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/ldap.conf.php
%else
%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/ldap.conf.php
%endif
%config(noreplace) %attr(0640,root,z-push) %_sysconfdir/z-push/ldap.conf.php
# KOPANO
%files -n %name-backend-kopano
......@@ -544,11 +528,7 @@ service nginx reload || true
%dir %zpush_dir/backend/kopano
%zpush_dir/backend/kopano/
%dir %_sysconfdir/z-push
%if 0%{?suse_version}
%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/kopano.conf.php
%else
%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/kopano.conf.php
%endif
%config(noreplace) %attr(0640,root,z-push) %_sysconfdir/z-push/kopano.conf.php
%files -n %name-kopano-gabsync
%defattr(-, root, root)
......@@ -556,11 +536,7 @@ service nginx reload || true
%dir %zpush_dir/tools/gab-sync
%zpush_dir/tools/gab-sync/
%dir %_sysconfdir/z-push
%if 0%{?suse_version}
%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/gabsync.conf.php
%else
%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/gabsync.conf.php
%endif
%config(noreplace) %attr(0640,root,z-push) %_sysconfdir/z-push/gabsync.conf.php
%_bindir/z-push-gabsync
%_mandir/man1/z-push-gabsync.1*
......@@ -570,11 +546,7 @@ service nginx reload || true
%dir %zpush_dir/tools/gab2contacts
%zpush_dir/tools/gab2contacts/
%dir %_sysconfdir/z-push
%if 0%{?suse_version}
%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/gab2contacts.conf.php
%else
%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/gab2contacts.conf.php
%endif
%config(noreplace) %attr(0640,root,z-push) %_sysconfdir/z-push/gab2contacts.conf.php
%_bindir/z-push-gab2contacts
%_mandir/man1/z-push-gab2contacts.1*
......@@ -594,11 +566,7 @@ service nginx reload || true
%dir %zpush_dir/backend/ipcmemcached
%zpush_dir/backend/ipcmemcached/
%dir %_sysconfdir/z-push
%if 0%{?suse_version}
%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/memcached.conf.php
%else
%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/memcached.conf.php
%endif
%config(noreplace) %attr(0640,root,z-push) %_sysconfdir/z-push/memcached.conf.php
# GALSEARCH-LDAP
%files -n %name-galsearch-ldap
......@@ -607,11 +575,7 @@ service nginx reload || true
%dir %zpush_dir/backend/searchldap
%zpush_dir/backend/searchldap/
%dir %_sysconfdir/z-push
%if 0%{?suse_version}
%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/galsearch-ldap.conf.php
%else
%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/galsearch-ldap.conf.php
%endif
%config(noreplace) %attr(0640,root,z-push) %_sysconfdir/z-push/galsearch-ldap.conf.php
# STATE-SQL
%files -n %name-state-sql
......@@ -621,11 +585,7 @@ service nginx reload || true
%zpush_dir/backend/sqlstatemachine/
%zpush_dir/tools/migrate-filestates-to-db.php
%dir %_sysconfdir/z-push
%if 0%{?suse_version}
%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/state-sql.conf.php
%else
%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/state-sql.conf.php
%endif
%config(noreplace) %attr(0640,root,z-push) %_sysconfdir/z-push/state-sql.conf.php
# AUTODISCOVER
%files -n %name-autodiscover
......@@ -633,30 +593,23 @@ service nginx reload || true
%dir %zpush_dir/autodiscover
%zpush_dir/autodiscover/
%dir %_sysconfdir/z-push
%if 0%{?suse_version}
%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/autodiscover.conf.php
%else
%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/autodiscover.conf.php
%endif
%config(noreplace) %attr(0640,root,z-push) %_sysconfdir/z-push/autodiscover.conf.php
# CONFIG
%files -n %name-config-apache
%dir %apache_dir
%dir %apache_dir/conf.d
%config(noreplace) %attr(0640,root,root) %apache_dir/conf.d/z-push.conf
%config(noreplace) %attr(0640,root,z-push) %apache_dir/conf.d/z-push.conf
%files -n %name-config-apache-autodiscover
%dir %apache_dir
%dir %apache_dir/conf.d
%config(noreplace) %attr(0640,root,root) %apache_dir/conf.d/z-push-autodiscover.conf
%config(noreplace) %attr(0640,root,z-push) %apache_dir/conf.d/z-push-autodiscover.conf
# NGINX CONFIG
%files -n %name-config-nginx
%dir %_sysconfdir/nginx
%dir %_sysconfdir/nginx/sites-available
%config(noreplace) %attr(0640,nginx,nginx) %_sysconfdir/nginx/sites-available/z-push.conf
#%config(noreplace) %attr(0640,nginx,nginx) %_sysconfdir/z-push/*.php
#%attr(750,nginx,nginx) %dir %_localstatedir/lib/z-push
#%attr(750,nginx,nginx) %dir %_localstatedir/log/z-push
%config(noreplace) %attr(0640,nginx,z-push) %_sysconfdir/nginx/sites-available/z-push.conf
%changelog
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment