projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ed24f09
)
transition script should ensure that the (old, deprecated) monkeysphere-server.conf...
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Sat, 28 Feb 2009 17:46:51 +0000
(12:46 -0500)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Sat, 28 Feb 2009 17:46:51 +0000
(12:46 -0500)
src/transitions/0.23
patch
|
blob
|
history
diff --git
a/src/transitions/0.23
b/src/transitions/0.23
index dead78871926c9462844481303133ce625d99429..67d1f63527255dd066374acc46a5fbff053b084c 100755
(executable)
--- a/
src/transitions/0.23
+++ b/
src/transitions/0.23
@@
-21,6
+21,7
@@
set -e
SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
set -e
SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
+SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
MADATADIR="${SYSDATADIR}/authentication"
MHDATADIR="${SYSDATADIR}/host"
MADATADIR="${SYSDATADIR}/authentication"
MHDATADIR="${SYSDATADIR}/host"
@@
-43,6
+44,13
@@
is_domain_name() {
printf "%s" "$1" | egrep -q '^[[:alnum:]][[:alnum:]-.]*[[:alnum:]]$'
}
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)
# 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)