updated versions

INSTALL.debian

@@ -19,18 +19,18 @@ echo "It is mostly automated but you will receive some prompts when installing"
 echo "Passenger towards the end of the script."
 echo
 echo -n "Enter the hostname for this server (ex: danbooru.donmai.us): "
-read hostname
+read HOSTNAME
 
-if [[ -z "$hostname" ]] ; then
+if [[ -z "$HOSTNAME" ]] ; then
   echo "Must enter a hostname"
   exit 1
 fi
 
 echo -n "Enter a name for the site (default: Danbooru): "
-read sitename
+read SITENAME
 
-if [[ -z "$sitename" ]] ; then
-  sitename=Danbooru
+if [[ -z "$SITENAME" ]] ; then
+  SITENAME=Danbooru
 fi
 
 # Install packages
@@ -64,6 +64,7 @@ gem install --no-ri --no-rdoc bundler
 # Install Passenger
 gem install --no-ri --no-rdoc -v 3.0.8 passenger
 rvm exec passenger-install-nginx-module
+rm /opt/nginx/conf/*.default
 
 if [ $? -ne 0 ]; then
   exit 1
@@ -97,7 +98,7 @@ update-rc.d -f nginx defaults
 mkdir -p /opt/nginx/conf/sites
 curl -s https://raw.github.com/r888888888/danbooru/master/script/install/nginx.conf > /opt/nginx/conf/nginx.conf
 curl -s https://raw.github.com/r888888888/danbooru/master/script/install/nginx.danbooru.conf > /opt/nginx/conf/sites/danbooru.conf
-sed -i -e 's/HOSTNAME/$hostname/g' /opt/nginx/conf/sites/danbooru.conf
+sed -i -e 's/\$hostname/$HOSTNAME/g' /opt/nginx/conf/sites/danbooru.conf
 /etc/init.d/nginx start
 
 echo "%wheel  ALL=(ALL)       ALL" >> /etc/sudoers