Commit 94ce0d37 authored by James Allen's avatar James Allen
Browse files

Add nginx config file to .deb build

parent aaf73bd6
......@@ -393,7 +393,8 @@ module.exports = (grunt) ->
command = ["-s", "dir", "-t", "deb", "-n", "sharelatex", "-v", "0.0.1", "--verbose"]
command.push(
"--maintainer", "ShareLaTeX <team@sharelatex.com>"
"--config-files", "/etc/sharelatex/settings.coffee",
"--config-files", "/etc/sharelatex/settings.coffee"
"--config-files", "/etc/nginx/sites-enabled/sharelatex"
"--directories", "/var/lib/sharelatex"
"--directories", "/var/log/sharelatex"
)
......@@ -449,6 +450,7 @@ module.exports = (grunt) ->
command.push(
"package/config/settings.coffee=/etc/sharelatex/settings.coffee"
"package/nginx/sharelatex=/etc/nginx/sites-enabled/sharelatex"
)
console.log "fpm " + command.join(" ")
proc = spawn "fpm", command, stdio: "inherit"
......
......@@ -6,7 +6,7 @@
#
# See http://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/
apt_repository 'mongodb-10gen' do
apt_repository 'mongodb-org' do
uri 'http://downloads-distro.mongodb.org/repo/ubuntu-upstart'
distribution 'dist'
components ['10gen']
......@@ -14,6 +14,6 @@ apt_repository 'mongodb-10gen' do
key '7F0CEB10'
end
package 'mongodb-10gen' do
package 'mongodb-org' do
action :install
end
\ No newline at end of file
server {
listen 80;
server_name _; # Catch all, see http://nginx.org/en/docs/http/server_names.html
set $static_path /var/www/sharelatex/web/public;
location / {
proxy_pass http://localhost:3000;
proxy_set_header Host $http_x_forwarded_host;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_read_timeout 3m;
proxy_send_timeout 3m;
}
location /stylesheets {
expires 1y;
root $static_path/;
}
location /minjs {
expires 1y;
root $static_path/;
}
location /img {
expires 1y;
root $static_path/;
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment