Gregory Petukhov committed 40af822 Merge

Automated merge with ssh://

Comments (0)

Files changed (1)

 # Install and configure mongodb
     libjpeg62-dev libfreetype6-dev \
     postgresql python-psycopg2 \
     postgresql-server-dev-8.4 \
-    libmysqld-dev
+    libmysqld-dev \
+    bind9-host
 if [ "$INSTALL_MONGO" == "YES" ]; then
     aptitude install mongodb-10gen
 echo "python tools"
 # Python libraries
-easy_install -U pip virtualenv sr fabric PIL
+easy_install -U pip virtualenv sr fabric pillow
 pip install -U uwsgi --use-mirrors
 echo "postgres web user"
 chown -R web:web $WEB_DIR
 cat > /home/web/.hgrc << 'EOF'
-username = Name Name <>
+username = Name Name <>
 echo "auto-start"
 # Настраиваем авто-запуск демонов, запускаем их
 update-rc.d uwsgi defaults
-update-rc.d uwsgi nginx
+update-rc.d nginx defaults
 /etc/init.d/nginx start
 /etc/init.d/uwsgi start
 #chown web:web $WEB_DIR/etc/uwsgi/test.ini
 # Disable in-memory /tmp which was enabled by default in debian squeeze
-cat /etc/default/rcS | sed s/RAMTMP=yes/RAMTMP=no/g > /tmp/rcS; cp /tmp/rcS /etc/default/
+if [ -z "$(grep RAMTMP /etc/default/rcS)" ]; then
+    echo "RAMTMP=no" >> /etc/default/rcS
+    cat /etc/default/rcS | sed s/RAMTMP=yes/RAMTMP=no/g > /tmp/rcS; cp /tmp/rcS /etc/default/
 # Setup exim 
 dpkg-reconfigure exim4-config