Skip to content

Commit

Permalink
Merge pull request xeoncross#16 from minecrafter/patch-1
Browse files Browse the repository at this point in the history
Correct IPv6 nginx error
  • Loading branch information
xeoncross committed Jun 26, 2013
2 parents d458010 + bb90fcc commit b5cbc07
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions setup-debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -432,14 +432,6 @@ END
echo 'Created /etc/nginx/sites-available/default_php sample vhost'
echo ' '

if [ -f /etc/nginx/sites-available/default ]
then
# Made IPV6 Listener not conflict and throw errors
sed -i \
"s/listen \[::]:80 default_server;/listen [::]:80 default_server ipv6only=on;/" \
/etc/nginx/sites-available/default
fi

if [ -f /etc/nginx/nginx.conf ]
then
# one worker for each CPU and max 1024 connections/worker
Expand Down Expand Up @@ -483,7 +475,7 @@ END
# Setting up Nginx mapping
cat > "/etc/nginx/sites-available/$1.conf" <<END
server {
listen 80;
listen [::]:80;
server_name www.$1 $1;
root /var/www/$1/public;
index index.html index.htm index.php;
Expand Down

0 comments on commit b5cbc07

Please sign in to comment.