Changeset 4088

Show
Ignore:
Timestamp:
Fri Nov 11 19:34:40 2005
Author:
mugur
Message:

fixed ticket:1517 - Put some binaries in sbin directory

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/campsite/configure

    r4069 r4088  
    87 87     echo -e "        (overrides --prefix option)"  
    88 88     echo -e "    --bin_dir [bin_dir]: set the campsite binaries directory"  
      89     echo -e "    --sbin_dir [sbin_dir]: set the campsite admin binaries directory"  
    89 90     echo -e "    --etc_dir [etc_dir]: set the campsite configuration directory"  
    90 91     echo -e "    --www_dir [www_dir]: set the campsite WWW directory; instance document root"  
    …… 
    111 112 set_campsite_dir=false  
    112 113 set_bin_dir=false  
      114 set_sbin_dir=false  
    113 115 set_etc_dir=false  
    114 116 set_www_dir=false  
    …… 
    127 129     --campsite_dir) export CAMPSITE_DIR=$2; set_campsite_dir=true; shift 1 ;;  
    128 130     --bin_dir) export BIN_DIR=$2; set_bin_dir=true; shift 1 ;;  
      131     --sbin_dir) export SBIN_DIR=$2; set_sbin_dir=true; shift 1 ;;  
    129 132     --etc_dir) export ETC_DIR=$2; set_etc_dir=true; shift 1 ;;  
    130 133     --www_dir) export WWW_DIR=$2; set_www_dir=true; shift 1 ;;  
    …… 
    144 147 if $set_campsite_dir; then  
    145 148     ! $set_bin_dir && export BIN_DIR=$CAMPSITE_DIR/bin  
      149     ! $set_sbin_dir && export SBIN_DIR=$CAMPSITE_DIR/sbin  
    146 150     ! $set_etc_dir && export ETC_DIR=$CAMPSITE_DIR/etc  
    147 151     ! $set_www_dir && export WWW_DIR=$CAMPSITE_DIR/www  
    …… 
    187 191 [ "\$1" = "--campsite_dir" ] && echo -n "$CAMPSITE_DIR"  
    188 192 [ "\$1" = "--bin_dir" ] && echo -n "$BIN_DIR"  
      193 [ "\$1" = "--sbin_dir" ] && echo -n "$SBIN_DIR"  
    189 194 [ "\$1" = "--etc_dir" ] && echo -n "$ETC_DIR"  
    190 195 [ "\$1" = "--www_dir" ] && echo -n "$WWW_DIR"  
    …… 
    210 215 export CAMPSITE_DIR=$CAMPSITE_DIR  
    211 216 export BIN_DIR=$BIN_DIR  
      217 export SBIN_DIR=$SBIN_DIR  
    212 218 export ETC_DIR=$ETC_DIR  
    213 219 export WWW_DIR=$WWW_DIR  
    348 354 export CAMPSITE_DIR=$CAMPSITE_DIR  
    349 355 export BIN_DIR=$BIN_DIR  
      356 export SBIN_DIR=$SBIN_DIR  
    350 357 export ETC_DIR=$ETC_DIR  
    351 358 export WWW_DIR=$WWW_DIR  

  • trunk/campsite/implementation/search/install_search

    r3943 r4088  
    1 1 #!/bin/bash  
    2 2  
    3   mkdir -p $BIN_DIR  
    4   install -o $ROOT_USER -g $APACHE_GROUP -m 750 gather "$BIN_DIR"  
      3 mkdir -p $SBIN_DIR  
      4 install -o $ROOT_USER -g $APACHE_GROUP -m 750 campsite_indexer "$SBIN_DIR"  
    5 5 [ $? -ne 0 ] && exit 1  
    6 6  
    11 11     uninstall_cron_task "$BIN_DIR/gather" /etc/crontab  
    12 12 fi  
    13   install_cron_task "0" "*/4" "*" "*" "*" "$ROOT_USER" "$BIN_DIR/gather" /etc/cron.d/campsite_gather -c || exit 1  
      13 install_cron_task "0" "*/4" "*" "*" "*" "$ROOT_USER" "$SBIN_DIR/campsite_indexer" /etc/cron.d/campsite_indexer -c || exit 1  
    13 13 restart_cron || exit 1  
    14 14 exit 0  

  • trunk/campsite/implementation/search/Makefile

    r3965 r4088  
    11 11 MAILNOTIFY_LINKS=ccampsiteinstance.h ccampsiteinstance.cpp  
    12 12  
    13   all: links gather  
      13 all: links campsite_indexer  
    13 13  
    14 14 links: dummy  
    …… 
    22 22     @if [ ! -L "configure.h" ]; then ln -s "$(INSTALL_CONF)/configure.h"; fi  
    23 23  
    24   gather: gather.o kwd.o readconf.o ccampsiteinstance.o mutex.o  
    25       g++ -o gather gather.o kwd.o readconf.o ccampsiteinstance.o mutex.o $(LDFLAGS) $(LDLIBS)  
      24 campsite_indexer: gather.o kwd.o readconf.o ccampsiteinstance.o mutex.o  
      25     g++ -o campsite_indexer gather.o kwd.o readconf.o ccampsiteinstance.o mutex.o $(LDFLAGS) $(LDLIBS)  
    26 26  
    27 27 gather.o: gather.cpp kwd.h configure.h readconf.h globals.h ccampsiteinstance.h mutex.h  
    36 36  
    37 37 clean: dummy  
    38       rm -f *.o *~ configure.h $(PARSER_LINKS) $(MAILNOTIFY_LINKS) gather  
      38     rm -f *.o *~ configure.h $(PARSER_LINKS) $(MAILNOTIFY_LINKS) campsite_indexer  
    38 38  
    39 39 install: all  

  • trunk/campsite/implementation/search/uninstall_search

    r3943 r4088  
    1 1 #!/bin/bash  
    2 2  
    3   rm -f "$BIN_DIR/gather"  
      3 rm -f "$SBIN_DIR/campsite_indexer"  
    3 3  
    4 4 if $USER_INSTALL; then exit 0; fi  
    7 7 . ${INSTALL_CONF}/cron_functions  
    8 8 if [ -f /etc/crontab ]; then  
    9       uninstall_cron_task "$BIN_DIR/gather" /etc/crontab  
      9     uninstall_cron_task "$SBIN_DIR/campsite_indexer" /etc/crontab  
    9 9 fi  
    10   uninstall_cron_task "$BIN_DIR/gather" /etc/cron.d/campsite_gather -d || exit 1  
      10 uninstall_cron_task "$SBIN_DIR/campsite_indexer" /etc/cron.d/campsite_indexer -d || exit 1  
    10 10 restart_cron  
    11 11 exit 0  

  • trunk/campsite/implementation/mailnotify/install_mailnotify

    r3943 r4088  
    1 1 #!/bin/bash  
    2 2  
    3   mkdir -p "$BIN_DIR"  
    4   install -o $ROOT_USER -g $APACHE_GROUP -m 750 notifyendsubs "$BIN_DIR"  
    5   install -o $ROOT_USER -g $APACHE_GROUP -m 750 notifyevents "$BIN_DIR"  
      3 mkdir -p "$SBIN_DIR"  
      4 install -o $ROOT_USER -g $APACHE_GROUP -m 750 campsite_notifyendsubs "$SBIN_DIR"  
      5 install -o $ROOT_USER -g $APACHE_GROUP -m 750 campsite_notifyevents "$SBIN_DIR"  
    6 6  
    7 7 if $USER_INSTALL; then exit 0; fi  
    12 12     uninstall_cron_task "$BIN_DIR/notifyevents" /etc/crontab  
    13 13 fi  
    14   install_cron_task "0" "*/8" "*" "*" "*" "$ROOT_USER" "$BIN_DIR/notifyendsubs" "/etc/cron.d/notifyendsubs" || exit 1  
    15   install_cron_task "*/2" "*" "*" "*" "*" "$ROOT_USER" "$BIN_DIR/notifyevents" "/etc/cron.d/notifyevents" || exit 1  
      14 install_cron_task "0" "*/8" "*" "*" "*" "$ROOT_USER" "$SBIN_DIR/campsite_notifyendsubs" "/etc/cron.d/campsite_notifyendsubs" || exit 1  
      15 install_cron_task "*/2" "*" "*" "*" "*" "$ROOT_USER" "$SBIN_DIR/campsite_notifyevents" "/etc/cron.d/campsite_notifyevents" || exit 1  
    16 16 restart_cron || exit 1  
    17 17 exit 0  

  • trunk/campsite/implementation/mailnotify/uninstall_mailnotify

    r3943 r4088  
    1 1 #!/bin/bash  
    2 2  
    3   rm -f "$BIN_DIR/notifyendsubs"  
    4   rm -f "$BIN_DIR/notifyevents"  
      3 rm -f "$SBIN_DIR/campsite_notifyendsubs"  
      4 rm -f "$SBIN_DIR/campsite_notifyevents"  
    5 5  
    6 6 if $USER_INSTALL; then exit 0; fi  
    8 8 . ${INSTALL_CONF}/cron_functions  
    9 9 if [ -f /etc/crontab ]; then  
    10       uninstall_cron_task "$BIN_DIR/notifyendsubs" /etc/crontab  
    11       uninstall_cron_task "$BIN_DIR/notifyevents" /etc/crontab  
      10     uninstall_cron_task "$SBIN_DIR/campsite_notifyendsubs" /etc/crontab  
      11     uninstall_cron_task "$SBIN_DIR/campsite_notifyevents" /etc/crontab  
    12 12 fi  
    13   uninstall_cron_task "$BIN_DIR/notifyendsubs" "/etc/cron.d/notifyendsubs" || exit 1  
    14   uninstall_cron_task "$BIN_DIR/notifyevents" "/etc/cron.d/notifyevents" || exit 1  
      13 uninstall_cron_task "$SBIN_DIR/campsite_notifyendsubs" "/etc/cron.d/campsite_notifyendsubs" || exit 1  
      14 uninstall_cron_task "$SBIN_DIR/campsite_notifyevents" "/etc/cron.d/campsite_notifyevents" || exit 1  
    15 15 restart_cron  
    16 16 exit 0  

  • trunk/campsite/implementation/mailnotify/Makefile

    r3965 r4088  
    22 22  
    23 23 notifyendsubs: notifyendsubs.o ccampsiteinstance.o mutex.o readconf.o  
    24       g++ -o notifyendsubs notifyendsubs.o readconf.o ccampsiteinstance.o mutex.o $(LDFLAGS) $(LDLIBS)  
    25       strip notifyendsubs  
      24     g++ -o campsite_notifyendsubs notifyendsubs.o readconf.o ccampsiteinstance.o mutex.o $(LDFLAGS) $(LDLIBS)  
      25     strip campsite_notifyendsubs  
    26 26  
    27 27 notifyevents: notifyevents.o ccampsiteinstance.o mutex.o readconf.o  
    28       g++ -o notifyevents notifyevents.o readconf.o ccampsiteinstance.o mutex.o $(LDFLAGS) $(LDLIBS)  
    29       strip notifyevents  
      28     g++ -o campsite_notifyevents notifyevents.o readconf.o ccampsiteinstance.o mutex.o $(LDFLAGS) $(LDLIBS)  
      29     strip campsite_notifyevents  
    30 30  
    31 31 clean: dummy  
    32       rm -f $(LINKS) *.o configure.h *~ notifyendsubs notifyevents  
      32     rm -f $(LINKS) *.o configure.h *~ campsite_notifyendsubs campsite_notifyevents  
    32 32     $(MAKE) -C smtp_wrapper clean  
    33 33  

  • trunk/campsite/implementation/management/bin/install_autopublish

    r3770 r4088  
    8 8     uninstall_cron_task "$BIN_DIR/autopublish" /etc/crontab  
    9 9 fi  
    10   install_cron_task "*" "*" "*" "*" "*" "$ROOT_USER" "$BIN_DIR/autopublish" /etc/cron.d/campsite_autopublish -c || exit 1  
      10 install_cron_task "*" "*" "*" "*" "*" "$ROOT_USER" "$SBIN_DIR/campsite_autopublish" /etc/cron.d/campsite_autopublish -c || exit 1  
    10 10 restart_cron || exit 1  
    11 11 exit 0  

  • trunk/campsite/implementation/management/bin/uninstall_autopublish

    r2687 r4088  
    6 6 . ${INSTALL_CONF}/cron_functions  
    7 7 if [ -f /etc/crontab ]; then  
    8       uninstall_cron_task "$BIN_DIR/autopublish" /etc/crontab  
      8     uninstall_cron_task "$SBIN_DIR/campsite_autopublish" /etc/crontab  
    8 8 fi  
    9   uninstall_cron_task "$BIN_DIR/autopublish" /etc/cron.d/campsite_autopublish -d || exit 1  
      9 uninstall_cron_task "$SBIN_DIR/campsite_autopublish" /etc/cron.d/campsite_autopublish -d || exit 1  
    9 9 restart_cron  
    10 10 exit 0  

  • trunk/campsite/implementation/management/bin/Makefile

    r2688 r4088  
    4 4  
    5 5 install:  
    6       mkdir -p $(BIN_DIR)  
    7       cp -f autopublish.php $(BIN_DIR)  
    8       cp -f autopublish $(BIN_DIR)  
    9       chown $(ROOT_USER):$(APACHE_GROUP) $(BIN_DIR)/autopublish  
    10       chown $(ROOT_USER):$(APACHE_GROUP) $(BIN_DIR)/autopublish.php  
      6     mkdir -p $(SBIN_DIR)  
      7     install -o $(ROOT_USER) -g $(APACHE_GROUP) -m 750 campsite_autopublish "$(SBIN_DIR)"  
      8     install -o $(ROOT_USER) -g $(APACHE_GROUP) -m 750 campsite_autopublish.php "$(SBIN_DIR)"  
    11 9     ./install_autopublish  
    12 10  
    14 12  
    15 13 uninstall:  
    16       rm -f $(BIN_DIR)/autopublish.php  
    17       rm -f $(BIN_DIR)/autopublish  
      14     rm -f $(SBIN_DIR)/campsite_autopublish.php  
      15     rm -f $(SBIN_DIR)/campsite_autopublish  
    18 16     ./uninstall_autopublish  
    19 17  

  • trunk/campsite/install_conf/install_conf.php

    r3746 r4088  
    5 5 $Campsite['CAMPSITE_DIR'] = '/usr/local/campsite';  
    6 6 $Campsite['BIN_DIR'] = '/usr/local/campsite/bin';  
      7 $Campsite['SBIN_DIR'] = '/usr/local/campsite/sbin';  
    7 8 $Campsite['ETC_DIR'] = '/usr/local/campsite/etc';  
    8 9 $Campsite['WWW_DIR'] = '/usr/local/campsite/www';  
    12 13 $Campsite['DEFAULT_DATABASE_SERVER_ADDRESS'] = 'localhost';  
    13 14  
    14   $CampsiteVars['install'] = array('APACHE_USER', 'APACHE_GROUP', 'CAMPSITE_DIR', 'BIN_DIR', 'ETC_DIR', 'WWW_DIR', 'WWW_COMMON_DIR', 'DEFAULT_SMTP_SERVER_ADDRESS', 'DEFAULT_SMTP_SERVER_PORT', 'DEFAULT_DATABASE_SERVER_ADDRESS');  
      15 $CampsiteVars['install'] = array('APACHE_USER', 'APACHE_GROUP', 'CAMPSITE_DIR', 'BIN_DIR', 'SBIN_DIR', 'ETC_DIR', 'WWW_DIR', 'WWW_COMMON_DIR', 'DEFAULT_SMTP_SERVER_ADDRESS', 'DEFAULT_SMTP_SERVER_PORT', 'DEFAULT_DATABASE_SERVER_ADDRESS');  
    14 15  
    15 16 ?>  

  • trunk/campsite/Makefile

    r4035 r4088  
    8 8     chown $(ROOT_USER):$(APACHE_GROUP) "$(BIN_DIR)"  
    9 9     chmod 755 "$(BIN_DIR)"  
      10     mkdir -p "$(SBIN_DIR)"  
      11     chown $(ROOT_USER):$(APACHE_GROUP) "$(SBIN_DIR)"  
      12     chmod 755 "$(SBIN_DIR)"  
    10 13     mkdir -p "$(ETC_DIR)"  
    11 14     chown $(ROOT_USER):$(APACHE_GROUP) "$(ETC_DIR)"  
    …… 
    27 30     chmod 755 "$(CAMPSITE_DIR)/instance"  
    28 31     install -m 755 -o $(ROOT_USER) -g $(APACHE_GROUP) "$(INSTALL_CONF)/campsite_config" "$(BIN_DIR)"  
      32     install -m 755 -o $(ROOT_USER) -g $(APACHE_GROUP) "$(INSTALL_CONF)/campsite_config" "$(SBIN_DIR)"  
    29 33     install -m 640 -o $(ROOT_USER) -g $(APACHE_GROUP) "$(INSTALL_CONF)/install_conf.php" "$(ETC_DIR)"  
    30 34     install -m 640 -o $(ROOT_USER) -g $(APACHE_GROUP) "$(INSTALL_CONF)/vhost-template.conf" "$(ETC_DIR)"  
    53 57     "$(INSTALL_CONF)/remove_all_instances" -f  
    54 58     $(MAKE) -C implementation uninstall  
    55       rm -f "$(BIN_DIR)/campsite_config"  
      59     rm -f "$(BIN_DIR)/campsite_config" "$(SBIN_DIR)/campsite_config"  
    55 59     rm -f "$(ETC_DIR)/install_conf.php" "$(ETC_DIR)/parser_conf.php" "$(ETC_DIR)/vhost-template.conf"  
    56 60     rmdir --ignore-fail-on-non-empty "$(BIN_DIR)"  
      61     rmdir --ignore-fail-on-non-empty "$(SBIN_DIR)"  
    57 62     rmdir --ignore-fail-on-non-empty "$(ETC_DIR)"  
    58 63     rmdir --ignore-fail-on-non-empty "$(WWW_DIR)"