summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-28 13:11:31 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-28 13:11:31 -0500
commitb5aa38db993aeef70d669f9b51b859ac3969b099 (patch)
tree48835c4252c40f46ae2582aeff334e9953606de0
parent54abd85dc6b4c54a99644eec21ce51635012ea8b (diff)
parent90e182fac0303b6a5a9c9da92446b366b2bdadd7 (diff)
Merge commit 'dkg/master'
-rwxr-xr-xsrc/transitions/0.238
1 files changed, 8 insertions, 0 deletions
diff --git a/src/transitions/0.23 b/src/transitions/0.23
index dead788..67d1f63 100755
--- a/src/transitions/0.23
+++ b/src/transitions/0.23
@@ -21,6 +21,7 @@
set -e
SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
+SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
MADATADIR="${SYSDATADIR}/authentication"
MHDATADIR="${SYSDATADIR}/host"
@@ -43,6 +44,13 @@ is_domain_name() {
printf "%s" "$1" | egrep -q '^[[:alnum:]][[:alnum:]-.]*[[:alnum:]]$'
}
+
+# move the old server conf file to be the authentication conf file
+if [ -f "$SYSCONFIGDIR"/monkeysphere-server.conf -a \
+ ! -f "$SYSCONFIGDIR"/monkeysphere-authentication.conf ] ; then
+ mv "$SYSCONFIGDIR"/monkeysphere-server.conf "$SYSCONFIGDIR"/monkeysphere-authentication.conf
+fi
+
# run the authentication setup (this is also the first chance to bail
# if 0.23 is not fully-installed, because m-a did not exist before
# 0.23)