diff --git a/Makefile b/Makefile index a3eedd1..bb2f6c6 100644 --- a/Makefile +++ b/Makefile @@ -53,8 +53,8 @@ install: $(BUILD_DIR)-stamp $(INSTALL) -c -m 644 www-data/*.css $(SHARE_DIR)/html/ $(INSTALL) -c -m 644 www-data/*.png $(SHARE_DIR)/html/ $(INSTALL) -c -m 644 www-data/*.gif $(SHARE_DIR)/html/ - $(INSTALL) -d -m 755 $(SHARE_DIR)/html/screenshots - $(INSTALL) -c -m 644 www-data/screenshots/*.png $(SHARE_DIR)/html/screenshots/ + #$(INSTALL) -d -m 755 $(SHARE_DIR)/html/screenshots + #$(INSTALL) -c -m 644 www-data/screenshots/*.png $(SHARE_DIR)/html/screenshots/ $(INSTALL) -d -m 755 $(DOC_DIR)/html/en $(INSTALL) -d -m 755 $(DOC_DIR)/html/de $(INSTALL) -c -m 644 doc/html/en/* $(DOC_DIR)/html/en/ diff --git a/bin/cbox-manage.sh b/bin/cbox-manage.sh index a7b805b..8a11ff1 100755 --- a/bin/cbox-manage.sh +++ b/bin/cbox-manage.sh @@ -35,12 +35,12 @@ DEVICE_NAME_PREFIX="Disk #" [ ! -e "$CONF_FILE" ] && echo "Could not find the configuration file: $CONF_FILE" >&2 && exit 1 # parse config file -source "$CONF_FILE" +. "$CONF_FILE" [ ! -e "$CONF_FILE" ] && echo "Could not find the distribution specific configuration file: $CONF_FILE" >&2 && exit 1 # parse the distribution specific file -source "$DISTRIBUTION_CONF" +. "$DISTRIBUTION_CONF" # check for writable log file [ -w "$LOG_FILE" ] || LOG_FILE=/tmp/$(basename "$LOG_FILE") @@ -263,6 +263,12 @@ function is_mounted() { } +# Parameter: DEVICE +function is_plain() { + "$ROOT_PERM_SCRIPT" is_plain_partition "$1" +} + + # Parameter: DEVICE function is_encrypted() { "$ROOT_PERM_SCRIPT" is_crypto_partition "$1" @@ -386,10 +392,15 @@ case "$ACTION" in is_mounted "$1" ;; is_encrypted ) - [ $# -ne 1 ] && error_msg 10 "invalid number of parameters for 'is_mounted'" + [ $# -ne 1 ] && error_msg 10 "invalid number of parameters for 'is_encrypted'" is_device_allowed "$1" || error_msg 12 "invalid device: $1" is_encrypted "$1" ;; + is_plain ) + [ $# -ne 1 ] && error_msg 10 "invalid number of parameters for 'is_plain'" + is_device_allowed "$1" || error_msg 12 "invalid device: $1" + is_plain "$1" + ;; check_config) is_config_active ;; diff --git a/bin/cbox-root-actions.sh b/bin/cbox-root-actions.sh index 2d7b2db..600a2b9 100755 --- a/bin/cbox-root-actions.sh +++ b/bin/cbox-root-actions.sh @@ -23,14 +23,14 @@ LIB_DIR=$(cd "$LIB_DIR"; pwd) [ "$(id -u)" -ne 0 ] && echo "$(basename $0) - only root may call this script" >&2 && exit 100 # read the default setting file, if it exists -[ -e /etc/default/cryptobox ] && source /etc/default/cryptobox +[ -e /etc/default/cryptobox ] && . /etc/default/cryptobox # set CONF_FILE to default value, if not configured in /etc/default/cryptobox CONF_FILE=${CONF_FILE:-/etc/cryptobox/cryptobox.conf} # parse config file -source "$CONF_FILE" +. "$CONF_FILE" # parse distribution specific file -source "$DISTRIBUTION_CONF" +. "$DISTRIBUTION_CONF" CB_SCRIPT="$LIB_DIR/cbox-manage.sh" CONFIG_MARKER=cryptobox.marker @@ -53,14 +53,13 @@ function is_device_allowed() # return the uuid of the partition (if possible) -# this only works for luks or ext2/3 partitions -# ignore volume-id as it may be non-unique +# this works at least for luks, ext2/3 and vfat partitions function get_device_uuid() { local UUID # check for luksUUID or ext2/3-uuid if is_luks_device "$1" then UUID=$("$CRYPTSETUP" luksUUID "$1") - else [ -x "$DUMPE2FS" ] && UUID=$("$DUMPE2FS" -h "$1" 2>/dev/null | grep "UUID" | cut -d ":" -f 2 | sed "s/ //g") + else [ -x "$BLKID" ] && UUID=$("$BLKID" -s UUID -o value -c /dev/null -w /dev/null "$1" 2>/dev/null) fi if test -z "$UUID" then get_device_flat_name "$1" @@ -204,8 +203,8 @@ case "$ACTION" in echo "zyxwvutsrqponmlkjihgfedcba9876543210" > "$keyfile" rm "$keyfile" # complete in background - ( # silent output from mkfs.ext3 - "$MKFS_DATA" -q "$DEV_MAPPER_DIR/$name" || \ + ( + "$MKFS_DATA" "$DEV_MAPPER_DIR/$name" || \ error_msg 13 "failed to create the encrypted filesystem" "$CRYPTSETUP" --batch-mode luksClose "$name" || \ error_msg 14 "failed to close the encrypted mapped device" @@ -218,8 +217,8 @@ case "$ACTION" in is_device_allowed "$1" || \ error_msg 3 "this device ($1) is not listed in SCAN_DEVICES (see $CONF_FILE)" # complete in background - ( # silent output from mkfs.ext3 - "$MKFS_DATA" -q "$1" || \ + ( + "$MKFS_DATA" "$1" || \ error_msg 15 "failed to create the plaintext filesystem" ) /dev/null & true @@ -266,7 +265,7 @@ case "$ACTION" in error_msg 3 "this device ($1) is not listed in SCAN_DEVICES (see $CONF_FILE)" is_luks_device "$1" ;; - is_data_partition ) + is_plain_partition ) # parameter: device # returns exitcode 0 if the device contains a readable filesystem [ $# -ne 1 ] && error_msg 1 "wrong number of parameters" @@ -275,12 +274,12 @@ case "$ACTION" in status=0 tmp_dir=/tmp/$(basename $0)-$$-mnt mkdir -p "$tmp_dir" - if mount "$1" "$tmp_dir" + if mount -o ro "$1" "$tmp_dir" then [ ! -e "$tmp_dir/$CONFIG_MARKER" ] && status=1 umount "$tmp_dir" fi rmdir "$tmp_dir" || true - [ "$status" -eq 1 ] && exit 0 + test "$status" -eq 1 && exit 0 exit 1 ;; trash_device ) @@ -326,7 +325,7 @@ case "$ACTION" in echo ' remount_config { ro | rw }' echo ' umount_config' echo ' is_config_partition $device' - echo ' is_plaindata_partition $device' + echo ' is_plain_partition $device' echo ' is_crypto_partition $device' echo ' trash_device $device' echo ' diskinfo $device' diff --git a/conf-examples/distributions/gnu_linux b/conf-examples/distributions/gnu_linux index 08bc7b6..7bf9377 100644 --- a/conf-examples/distributions/gnu_linux +++ b/conf-examples/distributions/gnu_linux @@ -6,7 +6,7 @@ CRYPTSETUP=/sbin/cryptsetup IFCONFIG=/sbin/ifconfig PMOUNT=/bin/pmount PUMOUNT=/bin/pumount -DUMPE2FS=/sbin/dumpe2fs +BLKID=/sbin/blkid POWEROFF=/sbin/poweroff REBOOT=/sbin/reboot diff --git a/debian/conffiles b/debian/conffiles deleted file mode 100644 index 6ac02ae..0000000 --- a/debian/conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/cryptobox/cryptobox.conf -/etc/default/cryptobox diff --git a/debian/control b/debian/control index 9930ada..03fc3eb 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,13 @@ Source: cryptobox Section: admin Priority: extra -Maintainer: sense.lab +Maintainer: sense.lab development Build-Depends: debhelper (>>3.0.0), dpatch, gcc (>=2.95) Standards-Version: 3.6.2 Package: cryptobox Architecture: any -Depends: bash (>=2.0), sed (>=4.0), coreutils, grep (>=2.0), perl, httpd-cgi, hashalot, libconfigfile-perl, cryptsetup (>=20050111), dmsetup, pmount, initscripts +Depends: bash (>=2.0), sed (>=4.0), coreutils, grep (>=2.0), perl, httpd-cgi, hashalot, libconfigfile-perl, cryptsetup (>=20050111), dmsetup, pmount, initscripts, e2fsprogs (>= 1.27), adduser Recommends: perl-clearsilver Suggests: cron, samba Description: Web interface for an encrypting fileserver diff --git a/debian/copyright b/debian/copyright index 87faeea..0219b29 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,305 +4,9 @@ Wed, May 10 21:23:16 CEST 2006 It was downloaded from http://cryptobox.org/ Upstream Authors: - sense.lab + sense.lab development Copyright: - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -314,37 +18,10 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with this program; if not, write to the + Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/conf-examples/defaults-cryptobox.conf b/debian/cryptobox.default similarity index 100% rename from conf-examples/defaults-cryptobox.conf rename to debian/cryptobox.default diff --git a/bin/init-script.sh b/debian/cryptobox.init similarity index 97% rename from bin/init-script.sh rename to debian/cryptobox.init index 4c05feb..bb13012 100755 --- a/bin/init-script.sh +++ b/debian/cryptobox.init @@ -42,7 +42,7 @@ case "$1" in # unmount all active containers "/usr/lib/cryptobox/cbox-manage.sh" umount_all ;; - restart ) + force-reload | restart ) "$0" stop "$0" start ;; diff --git a/debian/postinst b/debian/postinst index 8d11e36..9e93f60 100755 --- a/debian/postinst +++ b/debian/postinst @@ -13,7 +13,7 @@ if test -e "$CONF_FILE" test ! -e "$LOG_FILE" && touch "$LOG_FILE" && chown "$CRYPTOBOX_USER" "$LOG_FILE" fi -if getent passwd "$CRYPTOBOX_USER" &>/dev/null +if getent passwd "$CRYPTOBOX_USER" 2>/dev/null >/dev/null then # do nothing - the user already exists true else # create cryptobox user @@ -37,10 +37,14 @@ chmod 4750 "/usr/lib/cryptobox/cryptobox_root_wrapper" chown $CRYPTOBOX_USER: "/usr/lib/cgi-bin/cryptobox" chmod 6755 "/usr/lib/cgi-bin/cryptobox" -# add the cryptobox startup script to /etc/rc?.d -update-rc.d cryptobox defaults - -invoke-rc.d cryptobox restart +if [ -x "/etc/init.d/cryptobox" ]; then + update-rc.d cryptobox defaults >/dev/null + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d cryptobox start || exit $? + else + /etc/init.d/cryptobox start || exit $? + fi +fi true diff --git a/debian/postrm b/debian/postrm index 6d16264..3476a0c 100755 --- a/debian/postrm +++ b/debian/postrm @@ -1,13 +1,14 @@ #!/bin/sh -# remove symlinks in /etc/rc?.d -[ "$1" = "purge" ] && update-rc.d cryptobox remove - -if test "$1" = "purge" && getent passwd cryptobox &>/dev/null \ +if test "$1" = "purge" && getent passwd cryptobox 2>/dev/null >/dev/null \ && test "$(cd ~cryptobox;pwd)" = /var/lib/cryptobox then echo "Removing user 'cryptobox' ..." userdel -r cryptobox fi +if [ "$1" = "purge" ] ; then + update-rc.d cryptobox remove >/dev/null || exit $? +fi + # return without error true diff --git a/debian/prerm b/debian/prerm deleted file mode 100755 index ad590f6..0000000 --- a/debian/prerm +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# TODO: we should remove everything, except for "invoke-rc.d" - -# read the default setting file, if it exists -[ -e /etc/default/cryptobox ] && . /etc/default/cryptobox - -# set CONF_FILE to default value, if not configured in /etc/default/cryptobox -CONF_FILE=${CONF_FILE:-/etc/cryptobox/cryptobox.conf} - -# parse config file -if test -e "$CONF_FILE" - then source "$CONF_FILE" - else echo "[$(basename $0)] - configuration file ($CONF_FILE) not found!" >&2 - exit 1 - fi - -invoke-rc.d cryptobox stop - -true - diff --git a/debian/rules b/debian/rules index 19dfcef..33284e8 100755 --- a/debian/rules +++ b/debian/rules @@ -57,8 +57,6 @@ install: build $(MAKE) install PREFIX=$(DEB_BUILD_DIR)/usr install -c -m 644 build_dir/etc/cryptobox.conf $(DEB_BUILD_DIR)/etc/cryptobox/ install -c -m 644 build_dir/etc/distribution.conf $(DEB_BUILD_DIR)/etc/cryptobox/ - install -c -m 644 conf-examples/defaults-cryptobox.conf $(DEB_BUILD_DIR)/etc/default/cryptobox - install -c -m 755 bin/init-script.sh $(DEB_BUILD_DIR)/etc/init.d/cryptobox install -c -m 755 bin/cryptobox_cgi_wrapper $(DEB_BUILD_DIR)/usr/lib/cgi-bin/cryptobox @@ -79,7 +77,7 @@ binary-arch: build install # dh_installemacsen # dh_installpam # dh_installmime -# dh_installinit + dh_installinit # dh_installcron # dh_installinfo dh_installman