Merge lp:~jontai/openvista-gtm-integration/replication into lp:~derek-name/openvista-gtm-integration/replication

[Jon Tai]

[Derek_ (derek-name)]

review: Approve

=== modified file 'scripts/usr/sbin/ovgenconfig'
--- scripts/usr/sbin/ovgenconfig	2010-11-02 15:56:19 +0000
+++ scripts/usr/sbin/ovgenconfig	2010-11-18 22:36:10 +0000
@@ -65,19 +65,6 @@
 EOF
 }
 
-# "ROOT=$root" \
-# "INSTANCE=$instance" \
-# "REPLICATION_IP=$replication_ip" \
-# "BIND_ADDRESS=$bind_address" \
-# "USER=$user" \
-# "RSYNC_PORT=$rsync_port" \
-# "APACHE_USER=$apache_user" \
-# "DOCROOT=$docroot" \
-# "REPLICATION_MODE=$replication_mode" \
-# "OTHER_INSTANCE=$other_instance" \
-# "MUPIP_PORT=$mupip_port" \
-# "INSTSECONDARY=$instsecondary" \
-
 # check permissions
 if [[ $(id -u) != 0 ]]; then
     exit_command 4 "Only root may edit OpenVista configuration files"
@@ -114,71 +101,80 @@
 is_openvista_instance "$instance" \
   || exit_command $? "For instance \"$instance\": $ov_error"
 
+install_dir="$root/$instance/$subdirectory"
+[[ -d "$install_dir" ]] \
+  || exit_command 1 "Directory \"$install_dir\" does not exist"
+
 if $edit_existing; then
-    # Not all types of configuration files can be sourced for their
-    # existing values in the same way as replication.conf.
-    # This case statement allows for other types being supported in the future.
+    # Different config files have different formats.  Support for each type of
+    # file must be written explicitly.
     case $conf_file in
         "replication.conf")
-            # get the settings based on the existing file
-            . "$root/$instance/etc/replication.conf"
-            existing_settings=()
-            existing_settings+=( "REPLICATION_MODE=$replication_mode" )
-            existing_settings+=( "REPLICATION_IP=$replication_ip" )
-            existing_settings+=( "BIND_ADDRESS=$bind_address" )
-            existing_settings+=( "OTHER_INSTANCE=$other_instance" )
-            existing_settings+=( "MUPIP_PORT=$mupip_port" )
-            existing_settings+=( "INSTSECONDARY=$instsecondary" )
-            existing_settings+=( "RSYNC_PORT=$rsync_port" )
-            for setting in "${existing_settings[@]}"; do
-                key="${setting%%=*}"
-                value="${setting#*=}"
-                # if the new settings do not have the key,
-                # add the existing setting for it
-                array_lookup -q -d "=" "$key" "${settings[@]}" \
-                  || settings+=( "$setting" )
-            done
             ;;
         *)
             exit_command 2 "The -e option cannot be used with $conf_file"
             ;;
     esac
+
+    [[ -f "$install_dir/$conf_file" ]] \
+      || exit_command 1 "File \"$install_dir/$conf_file\" is not found"
+else
+    template_file="/usr/share/openvista/$conf_file"
+    [[ -f "$template_file" ]] \
+      || exit_command 1 "File \"$template_file\" is not found"
 fi
 
-install_dir="$root/$instance/$subdirectory"
-
 log -l "Creating \"$install_dir/$conf_file\" for $instance"
 
-template_file="/usr/share/openvista/$conf_file"
-[[ -f "$template_file" ]] \
-  || exit_command 1 "File \"$template_file\" is not found"
-
 # create a temporary directory in which to generate the new file
 tempdir=$(mktemp -d -p "$install_dir" .ovgenconfig.XXXXXXXXXX) \
   || exit_command 1 "Failed to create temporary directory in $install_dir"
 
-# make a copy of the template file in the temporary directory
-install -o root -g $user -m 640 "$template_file" "$tempdir/" \
-  || exit_command 1 "Failed to create a temporary file from the template"
-
-if [[ "${settings[@]}" ]]; then
-    # replace the magic strings in the new copy of the template file
-    expressions=()
-    for setting in "${settings[@]}"; do
-        key="${setting%%=*}"
-        value="${setting#*=}"
-        expressions+=( -e "s!{$key}!$value!g" )
-    done
-    sed -i "$tempdir/$conf_file" "${expressions[@]}" \
-      || exit_command 1 "Failed to write new values to the temporary file"
+if $edit_existing; then
+    # make a copy of the config file in the temporary directory
+    cp -p "$install_dir/$conf_file" "$tempdir/" \
+      || exit_command 1 "Failed to create a temporary file from the existing" \
+                        "configuration file"
+
+    case $conf_file in
+        "replication.conf")
+            if [[ "${settings[@]}" ]]; then
+	        # replace only the settings given to us while leaving the rest of
+	        # the file alone
+                expressions=()
+                for setting in "${settings[@]}"; do
+                    key=$(to_lower "${setting%%=*}")
+                    value="${setting#*=}"
+                    expressions+=( -e "s!$key=.*\$!$key=$value!" )
+                done
+                sed -i "$tempdir/$conf_file" "${expressions[@]}" \
+                  || exit_command 1 "Failed to write new values to the temporary file"
+            fi
+            ;;
+    esac
+else
+    # make a copy of the template file in the temporary directory
+    install -o root -g $user -m 640 "$template_file" "$tempdir/" \
+      || exit_command 1 "Failed to create a temporary file from the template"
+
+    if [[ "${settings[@]}" ]]; then
+        # replace the magic strings in the new copy of the template file
+        expressions=()
+        for setting in "${settings[@]}"; do
+            key="${setting%%=*}"
+            value="${setting#*=}"
+            expressions+=( -e "s!{$key}!$value!" )
+        done
+        sed -i "$tempdir/$conf_file" "${expressions[@]}" \
+          || exit_command 1 "Failed to write new values to the temporary file"
+    fi
 fi
 
-# copy the finished configuration file to the intended subdirectory
-cp -p "$tempdir/$conf_file" "$install_dir/$conf_file" \
+# move the finished configuration file to the intended subdirectory
+mv -f "$tempdir/$conf_file" "$install_dir/$conf_file" \
   || exit_command 1 "Failed to copy the temporary file to the intended" \
                     "subdirectory"
 
-# remove the temporary file and temporary directory
+# remove the temporary directory
 rm -rf "$tempdir" \
-  || exit_command 1 "Failed to remove the temporary file and/or temporary" \
-                    "directory"
+  || exit_command 1 "Failed to remove the temporary directory"