aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/install-as-user8
-rw-r--r--bin/site-specific-install.sh12
2 files changed, 7 insertions, 13 deletions
diff --git a/bin/install-as-user b/bin/install-as-user
index 502cf0e3e..2730fe404 100755
--- a/bin/install-as-user
+++ b/bin/install-as-user
@@ -30,14 +30,6 @@ DB_NAME="fixmystreet"
# Check that the arguments we've been passed are sensible:
-IP_ADDRESS_FOR_HOST="$(dig +short $HOST)"
-
-if [ x = x"$IP_ADDRESS_FOR_HOST" ]
-then
- error_msg "The hostname $HOST didn't resolve to an IP address"
- exit 1
-fi
-
if ! id "$UNIX_USER" 2> /dev/null > /dev/null
then
error_msg "The user '$UNIX_USER' didn't exist."
diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh
index 71bfc11ff..251c70e81 100644
--- a/bin/site-specific-install.sh
+++ b/bin/site-specific-install.sh
@@ -61,9 +61,11 @@ then
overwrite_rc_local
fi
-# Tell the user what to do next:
+if [ ! "$DEVELOPMENT_INSTALL" = true ]; then
+ # Tell the user what to do next:
-echo Installation complete - you should now be able to view the site at:
-echo http://$HOST/
-echo Or you can run the tests by switching to the "'$UNIX_USER'" user and
-echo running: $REPOSITORY/bin/run-tests t
+ echo Installation complete - you should now be able to view the site at:
+ echo http://$HOST/
+ echo Or you can run the tests by switching to the "'$UNIX_USER'" user and
+ echo running: $REPOSITORY/bin/run-tests t
+fi