install script fixes

This commit is contained in:
albert
2011-08-26 17:24:07 -04:00
parent 8031893ea7
commit d7ccb94a5e

View File

@@ -5,28 +5,28 @@ if [[ "$(whoami)" != "root" ]] ; then
exit 1 exit 1
fi fi
# echo "Danbooru Install" echo "Danbooru Install"
# echo "This script will install Ruby, Rails, PostgreSQL, and Nginx. By the end," echo "This script will install Ruby, Rails, PostgreSQL, and Nginx. By the end,"
# echo "you should be able to connect to the server and create an account." echo "you should be able to connect to the server and create an account."
# echo echo
# echo "It will create a new user called danbooru which will run the Danbooru" echo "It will create a new user called danbooru which will run the Danbooru"
# echo "processes. It will download the latest copy and install it in" echo "processes. It will download the latest copy and install it in"
# echo "/var/www/danbooru." echo "/var/www/danbooru."
# echo echo
# echo -n "Enter the hostname for this server (ex: danbooru.donmai.us): " 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" echo "Must enter a hostname"
# exit 1 exit 1
# fi fi
#
# echo -n "Enter a name for the site (default: Danbooru): " echo -n "Enter a name for the site (default: Danbooru): "
# read sitename read sitename
#
# if [[ -z "$sitename" ]] ; then if [[ -z "$sitename" ]] ; then
# sitename=Danbooru sitename=Danbooru
# fi fi
# Install packages # Install packages
echo "Installing packages..." echo "Installing packages..."
@@ -61,6 +61,15 @@ if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
# Create user account
useradd -m danbooru
PG_HBA_FILE="/etc/postgresql/9.1/main/pg_hba.conf"
echo "local all postgres,danbooru trust" > $PG_HBA_FILE
echo "host all postgres,danbooru 127.0.0.1/32 trust" >> $PG_HBA_FILE
/etc/init.d/postgresql restart
sudo -u postgres createuser -s danbooru
# Setup nginx # Setup nginx
curl -s https://raw.github.com/ascarter/nginx-ubuntu-rvm/master/nginx > /etc/init.d/nginx curl -s https://raw.github.com/ascarter/nginx-ubuntu-rvm/master/nginx > /etc/init.d/nginx
chmod +x,g-w /etc/init.d/nginx chmod +x,g-w /etc/init.d/nginx
@@ -71,15 +80,6 @@ curl -s https://raw.github.com/r888888888/danbooru/master/script/install/nginx.d
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 /etc/init.d/nginx start
# Create user account
useradd -m danbooru
PG_HBA_FILE="/etc/postgresql/9.1/main/pg_hba.conf"
echo "local all postgres,danbooru trust" > $PG_HBA_FILE
echo "host all postgres,danbooru 127.0.0.1/32 trust" >> $PG_HBA_FILE
/etc/init.d/postgresql-9.1 restart
sudo -u postgres createuser -s danbooru
echo echo
echo "I'm done!" echo "I'm done!"
echo "You should probably set the password for the danbooru account (run passwd danbooru)." echo "You should probably set the password for the danbooru account (run passwd danbooru)."