Commit 2a79a606 authored by James Allen's avatar James Allen
Browse files

Fix settings to use global directories

parent 5933dd60
......@@ -65,7 +65,7 @@ action :start do
end
end
#notifies :restart, "service[#{r.name}]"
notifies :restart, "service[#{r.name}]"
end
file "/etc/init/#{r.name}.conf" do
......@@ -88,6 +88,13 @@ action :start do
EOS
end
directory "/etc/sharelatex"
template "/etc/sharelatex/settings.coffee" do
mode 0400
user "www-data"
notifies :restart, "service[#{r.name}]"
end
service "#{r.name}" do
provider Chef::Provider::Service::Upstart
action :start
......
......@@ -5,11 +5,11 @@
# Copyright 2014, ShareLaTeX
#
directory "/etc/sharelatex"
template "/etc/sharelatex/settings.coffee" do
mode 0400
user "www-data"
for dir in ["compiles", "clsi-cache", "user_files"] do
directory "/var/lib/sharelatex/#{dir}" do
user "www-data"
recursive true
end
end
sharelatex_app "web-sharelatex" do
......@@ -35,4 +35,5 @@ end
sharelatex_app "clsi-sharelatex" do
repository "https://github.com/sharelatex/clsi-sharelatex.git"
revision "master"
end
\ No newline at end of file
end
......@@ -36,7 +36,7 @@ module.exports =
#
# For local filesystem this is the directory to store the files in.
# This path must exist, not be tmpfs and be writable to by the user sharelatex is run as.
user_files: Path.resolve(__dirname + "/../user_files")
user_files: "/var/lib/sharelatex/user_files"
# Uncomment if you need to configure your S3 credentials
# s3:
# # if you are using S3, then fill in your S3 details below
......@@ -65,7 +65,7 @@ module.exports =
username: "clsi"
password: ""
dialect: "sqlite"
storage: Path.resolve(__dirname + "/../db.sqlite")
storage: "/var/lib/sharelatex/clsi.sqlite"
# Service locations
# -----------------
......@@ -230,15 +230,15 @@ module.exports =
# Internal configs
# ----------------
path:
path:
# If we ever need to write something to disk (e.g. incoming requests
# that need processing but may be too big for memory, then write
# them to disk here).
dumpFolder: Path.resolve "data/dumpFolder"
# Where to write the project to disk before running LaTeX on it
compilesDir: Path.resolve(__dirname + "/../compiles")
compilesDir: "/var/lib/sharelatex/compiles"
# Where to cache downloaded URLs for the CLSI
clsiCacheDir: Path.resolve(__dirname + "/../cache")
clsiCacheDir: "/var/lib/sharelatex/clsi-cache"
# Automatic Snapshots
# -------------------
......
Supports Markdown
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