[debian-edu-commits] debian-edu/pkg-team/ 04/10: package scripts: Whitespace clean-up. Use tabs as indentations.
Mike Gabriel
sunweaver at debian.org
Mon May 19 06:43:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository gosa.
commit d77b1bc210210a912e8b94a672aa2417f5498a61
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun May 18 14:34:07 2014 +0200
package scripts: Whitespace clean-up. Use tabs as indentations.
---
debian/gosa-desktop.postinst | 2 +-
debian/gosa.postinst | 201 +++++++++++++++++++++----------------------
debian/gosa.postrm | 91 ++++++++++----------
3 files changed, 146 insertions(+), 148 deletions(-)
diff --git a/debian/gosa-desktop.postinst b/debian/gosa-desktop.postinst
index cd8b779..ecb7cc5 100755
--- a/debian/gosa-desktop.postinst
+++ b/debian/gosa-desktop.postinst
@@ -9,5 +9,5 @@ set -e
db_get gosa-desktop/url
if [ -n "$RET" ]; then
- echo "URL='$RET'" > /etc/gosa/desktoprc
+ echo "URL='$RET'" > /etc/gosa/desktoprc
fi
diff --git a/debian/gosa.postinst b/debian/gosa.postinst
index ce3d9c8..552867f 100755
--- a/debian/gosa.postinst
+++ b/debian/gosa.postinst
@@ -6,21 +6,21 @@
set -e
case "$1" in
- configure)
- ;;
+ configure)
+ ;;
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
- triggered)
- update-gosa
- exit 0
- ;;
+ triggered)
+ update-gosa
+ exit 0
+ ;;
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
esac
#DEBHELPER#
@@ -31,113 +31,112 @@ WEBGROUP="www-data"
# Create empty inclusion file for apache
if [ ! -f /etc/gosa/gosa.secrets ]; then
- touch /etc/gosa/gosa.secrets
- chmod 600 /etc/gosa/gosa.secrets
+ touch /etc/gosa/gosa.secrets
+ chmod 600 /etc/gosa/gosa.secrets
fi
if [ -d /etc/apache2/conf.d ]; then
- # Copy GOsa configuration to conf.d directories
- if [ ! -L /etc/apache2/conf.d/gosa.conf ]; then
-
- # Remove old instances of this file
- if [ -f /etc/apache2/conf.d/gosa.conf ]; then
- echo "Found old gosa apache configuration in /etc/apache2/conf.d - moving it to gosa.conf.orig..."
- echo "Please check for changes in /etc/gosa/gosa-apache.conf if you modified this file!"
- mv /etc/apache2/conf.d/gosa.conf /etc/apache2/conf.d/gosa.conf.orig
- fi
-
- echo "Making /gosa available in /etc/apache2/conf.d"
-
- # Add GOsa include file
- ln -s /etc/gosa/gosa-apache.conf /etc/apache2/conf.d/gosa.conf
- fi
-
- # Add support for RequestHeader
- if [ -x /usr/sbin/a2enmod ]; then
- a2enmod headers
- fi
-
- # Finally restart servers
- if [ -x /usr/sbin/apache2 ]; then
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d apache2 reload
- else
- /etc/init.d/apache2 reload
- fi
- fi
+ # Copy GOsa configuration to conf.d directories
+ if [ ! -L /etc/apache2/conf.d/gosa.conf ]; then
+
+ # Remove old instances of this file
+ if [ -f /etc/apache2/conf.d/gosa.conf ]; then
+ echo "Found old gosa apache configuration in /etc/apache2/conf.d - moving it to gosa.conf.orig..."
+ echo "Please check for changes in /etc/gosa/gosa-apache.conf if you modified this file!"
+ mv /etc/apache2/conf.d/gosa.conf /etc/apache2/conf.d/gosa.conf.orig
+ fi
+
+ echo "Making /gosa available in /etc/apache2/conf.d"
+
+ # Add GOsa include file
+ ln -s /etc/gosa/gosa-apache.conf /etc/apache2/conf.d/gosa.conf
+ fi
+
+ # Add support for RequestHeader
+ if [ -x /usr/sbin/a2enmod ]; then
+ a2enmod headers
+ fi
+
+ # Finally restart servers
+ if [ -x /usr/sbin/apache2 ]; then
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d apache2 reload
+ else
+ /etc/init.d/apache2 reload
+ fi
+ fi
fi
# conf-available
if [ -d /etc/apache2/conf-available ] ; then
- # Copy GOsa configuration to conf-available directory /etc/apache2/conf-available
- if [ ! -L /etc/apache2/conf-available/gosa.conf ]; then
-
- # Remove old instances of this file
- if [ -f /etc/apache2/conf-available/gosa.conf ]; then
- echo "Found old gosa apache configuration in /etc/apache2/conf-available/gosa.conf - moving it to /etc/apache2/conf-available/gosa.conf.orig ..."
- echo "Please check for changes in /etc/apache2/conf-available/gosa.conf.orig if you modified this file!"
- mv /etc/apache2/conf-available/gosa.conf /etc/apache2/conf-available/gosa.conf.orig
- fi
-
- echo "Making /gosa available in /etc/apache2/conf-available"
-
- # Add GOsa include file
- ln -s /etc/gosa/gosa-apache.conf /etc/apache2/conf-available/gosa.conf
- fi
-
- if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
- . /usr/share/apache2/apache2-maintscript-helper
- apache2_invoke enconf gosa
- apache2_invoke enmod headers
- fi
- # Finally restart servers
- if [ -x /usr/sbin/apache2 ]; then
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d apache2 reload
- else
- /etc/init.d/apache2 reload
- fi
- fi
+ # Copy GOsa configuration to conf-available directory /etc/apache2/conf-available
+ if [ ! -L /etc/apache2/conf-available/gosa.conf ]; then
+
+ # Remove old instances of this file
+ if [ -f /etc/apache2/conf-available/gosa.conf ]; then
+ echo "Found old gosa apache configuration in /etc/apache2/conf-available/gosa.conf - moving it to /etc/apache2/conf-available/gosa.conf.orig ..."
+ echo "Please check for changes in /etc/apache2/conf-available/gosa.conf.orig if you modified this file!"
+ mv /etc/apache2/conf-available/gosa.conf /etc/apache2/conf-available/gosa.conf.orig
+ fi
+
+ echo "Making /gosa available in /etc/apache2/conf-available"
+
+ # Add GOsa include file
+ ln -s /etc/gosa/gosa-apache.conf /etc/apache2/conf-available/gosa.conf
+ fi
+
+ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+ . /usr/share/apache2/apache2-maintscript-helper
+ apache2_invoke enconf gosa
+ apache2_invoke enmod headers
+ fi
+ # Finally restart servers
+ if [ -x /usr/sbin/apache2 ]; then
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d apache2 reload
+ else
+ /etc/init.d/apache2 reload
+ fi
+ fi
fi
if [ -d /etc/lighttpd/conf-available ]; then
- # Copy GOsa configuration to conf-available directories /etc/lighttpd/conf-available
- if [ ! -L /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ]; then
-
- # Remove old instances of this file
- if [ -f /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ]; then
- echo "Found old gosa apache configuration in /etc/lighttpd/conf-enabled - moving it to orig.gosa-lighttpd.conf ..."
- echo "Please check for changes in /etc/lighttpd/conf-available/orig.99gosa-lighttpd.conf if you modified this file!"
- mv /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf /etc/lighttpd/conf-available/orig.gosa-lighttpd.conf
- fi
-
- echo "Making /gosa available in /etc/lighttpd/conf-enabled/"
-
- # Add GOsa include file
- ln -s /etc/gosa/gosa-lighttpd.conf /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf
- fi
-
- # Finally restart servers
- if [ -x /usr/sbin/lighttpd ]; then
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d lighttpd reload
- else
- /etc/init.d/lighttpd reload
- fi
- fi
-
+ # Copy GOsa configuration to conf-available directories /etc/lighttpd/conf-available
+ if [ ! -L /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ]; then
+
+ # Remove old instances of this file
+ if [ -f /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ]; then
+ echo "Found old gosa apache configuration in /etc/lighttpd/conf-enabled - moving it to orig.gosa-lighttpd.conf ..."
+ echo "Please check for changes in /etc/lighttpd/conf-available/orig.99gosa-lighttpd.conf if you modified this file!"
+ mv /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf /etc/lighttpd/conf-available/orig.gosa-lighttpd.conf
+ fi
+
+ echo "Making /gosa available in /etc/lighttpd/conf-enabled/"
+
+ # Add GOsa include file
+ ln -s /etc/gosa/gosa-lighttpd.conf /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf
+ fi
+
+ # Finally restart servers
+ if [ -x /usr/sbin/lighttpd ]; then
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d lighttpd reload
+ else
+ /etc/init.d/lighttpd reload
+ fi
+ fi
fi
# Add links for safe mode
[ ! -d /usr/share/gosa/bin ] && mkdir -p /usr/share/gosa/bin
for source in /usr/bin/convert /usr/bin/lpstat; do
- if [ -e $source ]; then
- target=/usr/share/gosa/bin/${source##*/}
- [ ! -L $target ] && ln -sf $source $target
- fi
+ if [ -e $source ]; then
+ target=/usr/share/gosa/bin/${source##*/}
+ [ ! -L $target ] && ln -sf $source $target
+ fi
done
# Fix permission in /var/(spool|cache)/gosa
diff --git a/debian/gosa.postrm b/debian/gosa.postrm
index 1c3cc93..f7569ef 100755
--- a/debian/gosa.postrm
+++ b/debian/gosa.postrm
@@ -5,60 +5,59 @@
set -e
case "$1" in
- purge)
- if [ -d /var/spool/gosa ] ; then
- echo "Removing /var/spool/gosa as requested."
- rm -Rf /var/spool/gosa
- fi
- if [ -d /var/cache/gosa ] ; then
- echo "Removing /var/cache/gosa as requested."
- rm -Rf /var/cache/gosa
- fi
+ purge)
+ if [ -d /var/spool/gosa ] ; then
+ echo "Removing /var/spool/gosa as requested."
+ rm -Rf /var/spool/gosa
+ fi
+ if [ -d /var/cache/gosa ] ; then
+ echo "Removing /var/cache/gosa as requested."
+ rm -Rf /var/cache/gosa
+ fi
- [ -e /etc/gosa/gosa.secrets ] && rm /etc/gosa/gosa.secrets
- [ -e /usr/share/gosa/html/themes/default/images/img.png ] && rm /usr/share/gosa/html/themes/default/images/img.png
- [ -e /usr/share/gosa/ihtml/themes/default/img.styles ] && rm /usr/share/gosa/ihtml/themes/default/img.styles
- find /usr/share/gosa -depth -type d -empty -exec rmdir "{}" \;
+ [ -e /etc/gosa/gosa.secrets ] && rm /etc/gosa/gosa.secrets
+ [ -e /usr/share/gosa/html/themes/default/images/img.png ] && rm /usr/share/gosa/html/themes/default/images/img.png
+ [ -e /usr/share/gosa/ihtml/themes/default/img.styles ] && rm /usr/share/gosa/ihtml/themes/default/img.styles
+ find /usr/share/gosa -depth -type d -empty -exec rmdir "{}" \;
;;
- remove)
- if [ -d /etc/apache2/conf.d ]; then
- # Remove GOsa include
- [ -L /etc/apache2/conf.d/gosa.conf ] && rm -f /etc/apache2/conf.d/gosa.conf
+ remove)
+ if [ -d /etc/apache2/conf.d ]; then
+ # Remove GOsa include
+ [ -L /etc/apache2/conf.d/gosa.conf ] && rm -f /etc/apache2/conf.d/gosa.conf
- # Restart servers
- if [ -x /usr/sbin/apache2 ]; then
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d apache2 restart
- else
- /etc/init.d/apache2 restart
- fi
- fi
- fi
+ # Restart servers
+ if [ -x /usr/sbin/apache2 ]; then
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d apache2 restart
+ else
+ /etc/init.d/apache2 restart
+ fi
+ fi
+ fi
- if [ -d /etc/lighttpd/conf-available ]; then
- # Remove GOsa include
- [ -L /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ] && rm -f /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf
+ if [ -d /etc/lighttpd/conf-available ]; then
+ # Remove GOsa include
+ [ -L /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ] && rm -f /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf
- # Restart servers
- if [ -x /usr/sbin/lighttpd ]; then
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d lighttpd restart
- else
- /etc/init.d/lighttpd restart
- fi
- fi
- fi
-
- ;;
+ # Restart servers
+ if [ -x /usr/sbin/lighttpd ]; then
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d lighttpd restart
+ else
+ /etc/init.d/lighttpd restart
+ fi
+ fi
+ fi
+ ;;
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 0
- ;;
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
esac
#DEBHELPER#
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git
More information about the debian-edu-commits
mailing list