aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2017-10-31 12:04:54 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2017-10-31 12:04:54 +0200
commit4613bc8e41930b195baaa5def4b94d108f8d5dbe (patch)
tree0d606e104ffd70ffadcc3cc3f70337788aab65a5
parente847289f33de82eb4ef3d3213b13d93ff3087e8c (diff)
downloadscripts-4613bc8e41930b195baaa5def4b94d108f8d5dbe.tar.gz
scripts-4613bc8e41930b195baaa5def4b94d108f8d5dbe.tar.bz2
Update ec2setup
* ec2setup: Use full hostname as cn New command updatedb
-rwxr-xr-xec2setup25
1 files changed, 16 insertions, 9 deletions
diff --git a/ec2setup b/ec2setup
index 9d960bb..0275f7d 100755
--- a/ec2setup
+++ b/ec2setup
@@ -91,13 +91,9 @@ gethostinfo() {
return
fi
- commonname="${hostname%%.*}"
+ commonname=$(echo "$hostname" | sed 's/,/%2C/g')
- if test -n "$EC2_SETUP_TAG_DESCR"; then
- descr=$(ec2_get_tag $EC2_SETUP_TAG_DESCR)
- else
- descr=
- fi
+ descr=$(ec2_get_tag $EC2_SETUP_TAG_DESCR)
}
@@ -313,8 +309,8 @@ EOT
echo send) | update_dns $key
fi
- if test -n "$EC2_SETUP_LOCAL_ZONE"; then
- localzone=$(ec2_get_tag $EC2_SETUP_LOCAL_ZONE)
+ localzone=$(ec2_get_tag $EC2_SETUP_LOCAL_ZONE)
+ if test -n "$localzone"; then
server=$(get_nsupdate_value "$EC2_SETUP_NSUPDATE_SERVER" "$localzone")
key=$(get_nsupdate_value "$EC2_SETUP_NSUPDATE_KEY" "$localzone")
if test -n "$server" && test -n "$key"; then
@@ -517,13 +513,22 @@ start() {
register_cnames
}
+update_ldap() {
+ ip=
+ if test -n "$EC2_SETUP_TAG_IP"; then
+ ip=$(ec2_get_tag $EC2_SETUP_TAG_IP)
+ fi
+ gethostinfo
+ machine_up
+}
+
status() {
ip_status
}
stop() {
hostname=$(hostname)
- commonname="${hostname%%.*}"
+ commonname=$(echo "$hostname" | sed 's/,/%2C/g')
machine_down
deregister_hostname
deregister_cnames
@@ -572,6 +577,8 @@ case $1 in
start) start;;
status) status;;
stop) stop;;
+updatedb)
+ update_ldap;;
hostname)
gethostinfo 1
register_hostname

Return to:

Send suggestions and report system problems to the System administrator.