From 4da1e41d936fb0fc3bc24be5a104f0c4339fcd68 Mon Sep 17 00:00:00 2001 From: Jean Raby Date: Wed, 10 Apr 2013 16:20:47 -0400 Subject: [PATCH] deb: install a sample sogo.conf in /etc/sogo While there, replace mkdir + cp combo with 'install' --- packaging/debian-multiarch/rules | 11 +++++------ packaging/debian-multiarch/sogo.install | 3 ++- packaging/debian-multiarch/sogo.postinst | 6 ++++++ packaging/debian-multiarch/sogo.preinst | 2 +- packaging/debian/rules | 11 +++++------ packaging/debian/sogo.install | 3 ++- packaging/debian/sogo.postinst | 6 ++++++ packaging/debian/sogo.preinst | 2 +- 8 files changed, 28 insertions(+), 16 deletions(-) diff --git a/packaging/debian-multiarch/rules b/packaging/debian-multiarch/rules index 120a7a3b7..e764955a6 100755 --- a/packaging/debian-multiarch/rules +++ b/packaging/debian-multiarch/rules @@ -73,14 +73,13 @@ install-arch: build-arch $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends/SOGo.so; \ fi - mkdir -p debian/tmp/etc/default - cp Scripts/sogo-default debian/tmp/etc/default/sogo - mkdir -p debian/tmp/usr/share/lintian/overrides - cp debian/sogo.overrides debian/tmp/usr/share/lintian/overrides/sogo - mkdir -p debian/tmp/etc/apache2/conf.d - cp Apache/SOGo.conf debian/tmp/etc/apache2/conf.d/SOGo.conf + install -D Scripts/sogo-default debian/tmp/etc/default/sogo + install -D debian/sogo.overrides debian/tmp/usr/share/lintian/overrides/sogo + install -D Apache/SOGo.conf debian/tmp/etc/apache2/conf.d/SOGo.conf install -D -m 644 Scripts/sogo.cron debian/tmp/etc/cron.d/sogo install -D -m 644 Scripts/logrotate debian/tmp/etc/logrotate.d/sogo + install -d -m 750 debian/tmp/etc/ + install -D -m 640 Scripts/sogo.conf debian/tmp/etc/sogo.conf # Build architecture dependant packages using the common target. binary-arch: build-arch install-arch diff --git a/packaging/debian-multiarch/sogo.install b/packaging/debian-multiarch/sogo.install index 44d947d4f..5f22f31bc 100644 --- a/packaging/debian-multiarch/sogo.install +++ b/packaging/debian-multiarch/sogo.install @@ -1,7 +1,8 @@ -etc/default/sogo etc/apache2/conf.d/SOGo.conf etc/cron.d/sogo +etc/default/sogo etc/logrotate.d/sogo +etc/sogo/sogo.conf usr/sbin/* usr/lib/GNUstep/Frameworks/* usr/lib/GNUstep/Libraries/* diff --git a/packaging/debian-multiarch/sogo.postinst b/packaging/debian-multiarch/sogo.postinst index c4a7272fd..212de1139 100644 --- a/packaging/debian-multiarch/sogo.postinst +++ b/packaging/debian-multiarch/sogo.postinst @@ -20,6 +20,12 @@ case "$1" in configure) # update timestamp on imgs,css,js to let apache know the files changed find /usr/lib/GNUstep/SOGo/WebServerResources -exec touch {} \; + + # Enforce owner+mode on configuration + chmod 750 /etc/sogo + chown root:sogo /etc/sogo + chmod 640 /etc/sogo/sogo.conf + chown root:sogo /etc/sogo.conf ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/packaging/debian-multiarch/sogo.preinst b/packaging/debian-multiarch/sogo.preinst index fc2d475bf..552628002 100644 --- a/packaging/debian-multiarch/sogo.preinst +++ b/packaging/debian-multiarch/sogo.preinst @@ -18,7 +18,7 @@ if [ "$1" == "install" ] || [ "$1" == "upgrade" ]; then useradd -d /var/lib/sogo -g sogo -c "SOGo daemon" -s /usr/sbin/nologin -M -r sogo fi - # create mandatory dirs and enforce owner/perms + # create mandatory dirs and enforce owner+mode for dir in lib log run spool; do install -m 750 -o sogo -g sogo -d /var/$dir/sogo done diff --git a/packaging/debian/rules b/packaging/debian/rules index eac3a5a02..9f8549b80 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -77,14 +77,13 @@ install-arch: build-arch $(DESTDIR)/usr/lib/mapistore_backends/SOGo.so; \ fi - mkdir -p debian/tmp/etc/default - cp Scripts/sogo-default debian/tmp/etc/default/sogo - mkdir -p debian/tmp/usr/share/lintian/overrides - cp debian/sogo.overrides debian/tmp/usr/share/lintian/overrides/sogo - mkdir -p debian/tmp/etc/apache2/conf.d - cp Apache/SOGo.conf debian/tmp/etc/apache2/conf.d/SOGo.conf + install -D Scripts/sogo-default debian/tmp/etc/default/sogo + install -D debian/sogo.overrides debian/tmp/usr/share/lintian/overrides/sogo + install -D Apache/SOGo.conf debian/tmp/etc/apache2/conf.d/SOGo.conf install -D -m 644 Scripts/sogo.cron debian/tmp/etc/cron.d/sogo install -D -m 644 Scripts/logrotate debian/tmp/etc/logrotate.d/sogo + install -d -m 750 debian/tmp/etc/ + install -D -m 640 Scripts/sogo.conf debian/tmp/etc/sogo.conf # Build architecture dependant packages using the common target. binary-arch: build-arch install-arch diff --git a/packaging/debian/sogo.install b/packaging/debian/sogo.install index 44d947d4f..5f22f31bc 100644 --- a/packaging/debian/sogo.install +++ b/packaging/debian/sogo.install @@ -1,7 +1,8 @@ -etc/default/sogo etc/apache2/conf.d/SOGo.conf etc/cron.d/sogo +etc/default/sogo etc/logrotate.d/sogo +etc/sogo/sogo.conf usr/sbin/* usr/lib/GNUstep/Frameworks/* usr/lib/GNUstep/Libraries/* diff --git a/packaging/debian/sogo.postinst b/packaging/debian/sogo.postinst index c4a7272fd..212de1139 100644 --- a/packaging/debian/sogo.postinst +++ b/packaging/debian/sogo.postinst @@ -20,6 +20,12 @@ case "$1" in configure) # update timestamp on imgs,css,js to let apache know the files changed find /usr/lib/GNUstep/SOGo/WebServerResources -exec touch {} \; + + # Enforce owner+mode on configuration + chmod 750 /etc/sogo + chown root:sogo /etc/sogo + chmod 640 /etc/sogo/sogo.conf + chown root:sogo /etc/sogo.conf ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/packaging/debian/sogo.preinst b/packaging/debian/sogo.preinst index fc2d475bf..552628002 100644 --- a/packaging/debian/sogo.preinst +++ b/packaging/debian/sogo.preinst @@ -18,7 +18,7 @@ if [ "$1" == "install" ] || [ "$1" == "upgrade" ]; then useradd -d /var/lib/sogo -g sogo -c "SOGo daemon" -s /usr/sbin/nologin -M -r sogo fi - # create mandatory dirs and enforce owner/perms + # create mandatory dirs and enforce owner+mode for dir in lib log run spool; do install -m 750 -o sogo -g sogo -d /var/$dir/sogo done