Changeset 4035

Show
Ignore:
Timestamp:
Sat Oct 22 14:58:21 2005
Author:
mugur
Message:

fixed ticket:1258 - Campsite instance utilities (create_instance etc) need globally-acceptable names

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/campsite/install.sh

    r4030 r4035  
    67 67     echo "MySQL configuration is different from the default one or you did not"  
    68 68     echo "install an email server. Run:"  
    69       echo "$BIN_DIR/create_instance --help"  
      69     echo "$BIN_DIR/campsite-create-instance --help"  
    69 69     echo "to find out how to set Campsite instance parameters."  
    70 70     echo -e "\nIMPORTANT!!!"  
    83 83     echo "You should change the password as soon as possible."  
    84 84     else  
    85       echo "Run create_instance script in order to complete Campsite install."  
      85     echo "Run campsite-create-instance script in order to complete Campsite install."  
    85 85     fi  
    86 86 }  

  • trunk/campsite/implementation/utils/Makefile

    r4031 r4035  
    5 5 install:  
    6 6     mkdir -p "$(BIN_DIR)"  
    7       install -m 755 -o $(ROOT_USER) -g $(APACHE_GROUP) "create_instance" "$(BIN_DIR)"  
    8       install -m 755 -o $(ROOT_USER) -g $(APACHE_GROUP) "backup_instance" "$(BIN_DIR)"  
    9       install -m 755 -o $(ROOT_USER) -g $(APACHE_GROUP) "restore_instance" "$(BIN_DIR)"  
    10       install -m 755 -o $(ROOT_USER) -g $(APACHE_GROUP) "remove_instance" "$(BIN_DIR)"  
    11       install -m 644 -o $(ROOT_USER) -g $(APACHE_GROUP) "create_instance.php" "$(BIN_DIR)"  
    12       install -m 644 -o $(ROOT_USER) -g $(APACHE_GROUP) "backup_instance.php" "$(BIN_DIR)"  
    13       install -m 644 -o $(ROOT_USER) -g $(APACHE_GROUP) "restore_instance.php" "$(BIN_DIR)"  
    14       install -m 644 -o $(ROOT_USER) -g $(APACHE_GROUP) "remove_instance.php" "$(BIN_DIR)"  
      7     install -m 755 -o $(ROOT_USER) -g $(APACHE_GROUP) "campsite-create-instance" "$(BIN_DIR)"  
      8     install -m 755 -o $(ROOT_USER) -g $(APACHE_GROUP) "campsite-backup-instance" "$(BIN_DIR)"  
      9     install -m 755 -o $(ROOT_USER) -g $(APACHE_GROUP) "campsite-restore-instance" "$(BIN_DIR)"  
      10     install -m 755 -o $(ROOT_USER) -g $(APACHE_GROUP) "campsite-remove-instance" "$(BIN_DIR)"  
      11     install -m 644 -o $(ROOT_USER) -g $(APACHE_GROUP) "campsite-create-instance.php" "$(BIN_DIR)"  
      12     install -m 644 -o $(ROOT_USER) -g $(APACHE_GROUP) "campsite-backup-instance.php" "$(BIN_DIR)"  
      13     install -m 644 -o $(ROOT_USER) -g $(APACHE_GROUP) "campsite-restore-instance.php" "$(BIN_DIR)"  
      14     install -m 644 -o $(ROOT_USER) -g $(APACHE_GROUP) "campsite-remove-instance.php" "$(BIN_DIR)"  
    15 15     install -m 644 -o $(ROOT_USER) -g $(APACHE_GROUP) "cli_script_lib.php" "$(BIN_DIR)"  
    16       install -m 755 -o $(ROOT_USER) -g $(APACHE_GROUP) "update_instances" "$(BIN_DIR)"  
      16     install -m 755 -o $(ROOT_USER) -g $(APACHE_GROUP) "campsite-update-instances" "$(BIN_DIR)"  
    16 16  
    17 17 clean: dummy  
    18 18  
    19 19 uninstall: dummy  
    20       rm -f "$(BIN_DIR)/create_instance" "$(BIN_DIR)/create_instance.php"  
    21       rm -f "$(BIN_DIR)/backup_instance" "$(BIN_DIR)/backup_instance.php"  
    22       rm -f "$(BIN_DIR)/restore_instance" "$(BIN_DIR)/restore_instance.php"  
    23       rm -f "$(BIN_DIR)/remove_instance" "$(BIN_DIR)/remove_instance.php"  
    24       rm -f "$(BIN_DIR)/cli_script_lib.php" "$(BIN_DIR)/update_instances"  
      20     rm -f "$(BIN_DIR)/campsite-create-instance" "$(BIN_DIR)/campsite-create-instance.php"  
      21     rm -f "$(BIN_DIR)/campsite-backup-instance" "$(BIN_DIR)/campsite-backup-instance.php"  
      22     rm -f "$(BIN_DIR)/campsite-restore-instance" "$(BIN_DIR)/campsite-restore-instance.php"  
      23     rm -f "$(BIN_DIR)/campsite-remove-instance" "$(BIN_DIR)/campsite-remove-instance.php"  
      24     rm -f "$(BIN_DIR)/cli_script_lib.php" "$(BIN_DIR)/campsite-update-instances"  
    25 25  
    26 26 dummy:  

  • trunk/campsite/INSTALL

    r3880 r4035  
    113 113 run:  
    114 114  
    115   /usr/local/campsite/bin/create_instance --db_name [instance_name]  
      115 /usr/local/campsite/bin/campsite-create-instance --db_name [instance_name]  
    115 115  
    116 116 - Edit the file "[instance_name]-vhost.conf" from the instance configuration  

  • trunk/campsite/install_conf/remove_all_instances

    r3943 r4035  
    29 29     if [ -d "$inst_name" ]; then  
    30 30         echo -n "Removing instance $inst_name ..."  
    31           "$BIN_DIR/remove_instance" $inst_name  
      31         "$BIN_DIR/campsite-remove-instance" $inst_name  
    31 31         echo "done"  
    32 32     fi  

  • trunk/campsite/install_conf/install_functions

    r3943 r4035  
    207 207     index=`expr $index + 1`  
    208 208 done  
    209   echo -e "\nRunning $BIN_DIR/create_instance"  
      209 echo -e "\nRunning $BIN_DIR/campsite-create-instance"  
    209 209 if [ "$cli_args" != "" ]; then  
    210 210     echo -e "with the following arguments: $cli_args\n"  
    213 213     echo -e "with no arguments (use default values)\n"  
    214 214 fi  
    215   $BIN_DIR/create_instance $cli_args && export DEF_INST_INSTALLED=Y && return 0  
      215 $BIN_DIR/campsite-create-instance $cli_args && export DEF_INST_INSTALLED=Y && return 0  
    215 215 return 1  
    216 216 }  

  • trunk/campsite/Makefile

    r4031 r4035  
    32 32     install -m 644 -o $(ROOT_USER) -g $(APACHE_GROUP) "$(INSTALL_CONF)/campsite_version.php" "$(HTML_COMMON_DIR)"  
    33 33     $(MAKE) -C implementation install  
    34       $(BIN_DIR)/update_instances  
      34     $(BIN_DIR)/campsite-update-instances  
    34 34  
    35 35 test_install:  
    41 41  
    42 42 default_instance:  
    43       @"$(BIN_DIR)/create_instance"  
      43     @"$(BIN_DIR)/campsite-create-instance"  
    43 43  
    44 44 clean: