diff --git a/Makefile b/Makefile
index 7a5d78ea89a06b900234a13ee6ba5174b87da5c2..7892a4f9740a442687bc485b08ad2c28f17853b2 100644
--- a/Makefile
+++ b/Makefile
@@ -252,6 +252,7 @@ openssh/ssh_host_rsa_key:
nginx-setup: nginx/conf/nginx.conf nginx/logs nginx/tmp
+.PHONY: nginx/conf/nginx.conf
nginx/conf/nginx.conf:
sed -e "s|/home/git|${gitlab_development_root}|" nginx/conf/nginx.conf.example > $@
diff --git a/Procfile.example b/Procfile.example
index 94c61dadd3176fbfc00af8beece492f26d8c5152..7c7f671c59ac80dfb20d98c0178f7ce16f9850a5 100644
--- a/Procfile.example
+++ b/Procfile.example
@@ -12,5 +12,5 @@ rails-background-jobs: exec /usr/bin/env SIDEKIQ_LOG_ARGUMENTS=1 RAILS_ENV=devel
#influxdb: exec influxdb/bin/influxd -config influxdb/influxdb.conf
#grafana: exec support/wait-postgresql-ready support/exec-cd grafana bin/grafana-server -config grafana.ini
#sshd: exec /usr/sbin/sshd -e -D -f /home/git/openssh/sshd_config
-#nginx: exec nginx -p /home/git/nginx -c conf/nginx.conf
+nginx: exec nginx -p /home/git/nginx -c conf/nginx.conf
#gitaly: exec /usr/bin/env GITALY_SOCKET_PATH=/home/git/gitaly.socket GITALY_PROMETHEUS_LISTEN_ADDR=:9101 gitaly/bin/gitaly
diff --git a/doc/prepare.md b/doc/prepare.md
index 60a827f276c6b8db4eeacfe0634f0ff544b9f8cb..0ea90d6c1544c8d60bcff692e22440bfc8924535 100644
--- a/doc/prepare.md
+++ b/doc/prepare.md
@@ -38,7 +38,7 @@ Please read [the prerequisites for all platforms](#prerequisites-for-all-platfor
```
brew tap homebrew/dupes
brew tap homebrew/versions
-brew install git redis postgresql libiconv icu4c pkg-config cmake nodejs go openssl node npm
+brew install git redis postgresql libiconv icu4c pkg-config cmake nodejs go openssl node npm nginx
bundle config build.eventmachine --with-cppflags=-I/usr/local/opt/openssl/include
npm install phantomjs-prebuilt@2.1.12 -g
```
@@ -49,6 +49,7 @@ We are using PostgreSQL-9.5 in the following example. If you want to use another
```
sudo port install git redis libiconv postgresql95-server icu pkgconfig cmake nodejs4 go openssl npm2
+sudo port install nginx +ssl
bundle config build.eventmachine --with-cppflags=-I/opt/local/include/openssl
sudo npm install phantomjs-prebuilt@2.1.12 -g
echo 'export PATH=/opt/local/lib/postgresql95/bin/:$PATH' >> ~/.profile
@@ -65,7 +66,7 @@ sudo apt-get install software-properties-common python-software-properties
# This PPA contains an up-to-date version of Go
sudo apt-add-repository -y ppa:ubuntu-lxc/lxd-stable
sudo apt-get update
-sudo apt-get install git postgresql postgresql-contrib libpq-dev redis-server libicu-dev cmake g++ nodejs nodejs-legacy npm libkrb5-dev golang ed pkg-config
+sudo apt-get install git postgresql postgresql-contrib libpq-dev redis-server libicu-dev cmake g++ nodejs nodejs-legacy npm libkrb5-dev golang ed pkg-config nginx
npm install phantomjs-prebuilt@2.1.12 -g
```
@@ -74,7 +75,7 @@ npm install phantomjs-prebuilt@2.1.12 -g
Please read [the prerequisites for all platforms](#prerequisites-for-all-platforms).
```
-pacman -S postgresql redis postgresql-libs icu nodejs ed cmake openssh git go
+pacman -S postgresql redis postgresql-libs icu nodejs ed cmake openssh git go nginx
npm install phantomjs-prebuilt@2.1.12 -g
```
@@ -83,7 +84,7 @@ npm install phantomjs-prebuilt@2.1.12 -g
Please read [the prerequisites for all platforms](#prerequisites-for-all-platforms).
```
-sudo apt-get install postgresql postgresql-contrib libpq-dev redis-server libicu-dev cmake g++ nodejs npm libkrb5-dev ed pkg-config
+sudo apt-get install postgresql postgresql-contrib libpq-dev redis-server libicu-dev cmake g++ nodejs npm libkrb5-dev ed pkg-config nginx-full
```
If you are running Debian Stretch or newer you will need to install Go
@@ -108,7 +109,7 @@ You may need to install Redis 2.8 or newer manually.
We assume you are using Fedora >= 22.
```
-sudo dnf install postgresql libpqxx-devel postgresql-libs redis libicu-devel nodejs git ed cmake rpm-build gcc-c++ krb5-devel go postgresql-server postgresql-contrib
+sudo dnf install postgresql libpqxx-devel postgresql-libs redis libicu-devel nodejs git ed cmake rpm-build gcc-c++ krb5-devel go postgresql-server postgresql-contrib nginx
```
Install `phantomJS` manually, or download it and put in your $PATH. For
@@ -125,7 +126,7 @@ This is tested on CentOS 6.5:
```
sudo yum install http://yum.postgresql.org/9.3/redhat/rhel-6-x86_64/pgdg-redhat93-9.3-1.noarch.rpm
sudo yum install https://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
-sudo yum install postgresql93-server libicu-devel cmake gcc-c++ redis ed fontconfig freetype libfreetype.so.6 libfontconfig.so.1 libstdc++.so.6 golang nodejs
+sudo yum install postgresql93-server libicu-devel cmake gcc-c++ redis ed fontconfig freetype libfreetype.so.6 libfontconfig.so.1 libstdc++.so.6 golang nodejs nginx
sudo rvm install 2.3
sudo rvm use 2.3
@@ -156,7 +157,7 @@ sudo zypper dup
sudo zypper install libxslt-devel postgresql postgresql-devel libpqxx-devel redis libicu-devel nodejs git ed cmake \
rpm-build gcc-c++ krb5-devel go postgresql-server postgresql-contrib \
- libxml2-devel libxml2-devel-32bit findutils-locate
+ libxml2-devel libxml2-devel-32bit findutils-locate nginx
sudo npm install -g phantomjs
```
@@ -189,7 +190,7 @@ Please read [the prerequisites for all platforms](#prerequisites-for-all-platfor
```
sudo pkg install postgresql93-server postgresql93-contrib postgresql-libpqxx \
-redis go node icu krb5 phantomjs gmake
+redis go node icu krb5 phantomjs gmake nginx
```
### Other platforms
diff --git a/nginx/conf/nginx.conf.example b/nginx/conf/nginx.conf.example
index 372e43f601277f961cb9c0b4c1e9ebd5c95829a5..684dfb8eab2b7a32357efd577918daf9e6ae0c91 100644
--- a/nginx/conf/nginx.conf.example
+++ b/nginx/conf/nginx.conf.example
@@ -39,10 +39,11 @@ http {
}
server {
- listen 127.0.0.1:3443 ssl;
+ listen 127.0.0.1:3080;
- ssl_certificate /home/git/localhost.crt;
- ssl_certificate_key /home/git/localhost.key;
+ location ~* /assets/favicon.*\.ico$ {
+ alias /home/git/nginx/favicon-gdk.ico;
+ }
location / {
proxy_set_header Host $http_host;
@@ -50,7 +51,7 @@ http {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Upgrade $http_upgrade;
- proxy_set-header Connection $connection_upgrade;
+ proxy_set_header Connection $connection_upgrade;
proxy_read_timeout 300;
diff --git a/nginx/favicon-gdk.ico b/nginx/favicon-gdk.ico
new file mode 100755
index 0000000000000000000000000000000000000000..71acdf670ab48827376ef071657da6d7fa9e306f
Binary files /dev/null and b/nginx/favicon-gdk.ico differ