Include LaTeX path in upstart

Gruntfile.coffee

@@ -425,16 +425,17 @@ module.exports = (grunt) ->
 				chown sharelatex:sharelatex /var/log/sharelatex
 				
 				mkdir -p /var/lib/sharelatex
-				chown sharelatex:sharelatex /var/lib/sharelatex
 
 			"""
 
 			for dir in ["data/user_files", "tmp/uploads", "data/compiles", "data/cache", "tmp/dumpFolder"]
 				after_install_script += """
 					mkdir -p /var/lib/sharelatex/#{dir}
-					chown sharelatex:sharelatex /var/lib/sharelatex/#{dir}
-					
 				"""
+			
+			after_install_script += """
+				chown -R sharelatex:sharelatex /var/lib/sharelatex
+			"""	
 
 			for service in SERVICES
 				after_install_script += "service sharelatex-#{service.name} restart\n"

package/scripts/after_install.sh

@@ -9,18 +9,7 @@ mkdir -p /var/log/sharelatex
 chown sharelatex:sharelatex /var/log/sharelatex
 
 mkdir -p /var/lib/sharelatex
-chown sharelatex:sharelatex /var/lib/sharelatex
-mkdir -p /var/lib/sharelatex/data/user_files
-chown sharelatex:sharelatex /var/lib/sharelatex/data/user_files
-mkdir -p /var/lib/sharelatex/tmp/uploads
-chown sharelatex:sharelatex /var/lib/sharelatex/tmp/uploads
-mkdir -p /var/lib/sharelatex/data/compiles
-chown sharelatex:sharelatex /var/lib/sharelatex/data/compiles
-mkdir -p /var/lib/sharelatex/data/cache
-chown sharelatex:sharelatex /var/lib/sharelatex/data/cache
-mkdir -p /var/lib/sharelatex/tmp/dumpFolder
-chown sharelatex:sharelatex /var/lib/sharelatex/tmp/dumpFolder
-service sharelatex-web restart
+mkdir -p /var/lib/sharelatex/data/user_filesmkdir -p /var/lib/sharelatex/tmp/uploadsmkdir -p /var/lib/sharelatex/data/compilesmkdir -p /var/lib/sharelatex/data/cachemkdir -p /var/lib/sharelatex/tmp/dumpFolderchown -R sharelatex:sharelatex /var/lib/sharelatexservice sharelatex-web restart
 service sharelatex-document-updater restart
 service sharelatex-clsi restart
 service sharelatex-filestore restart

package/upstart/sharelatex-chat

@@ -20,8 +20,9 @@ script
     # path to Node.js if it's not in your system PATH.
     NODE=node
     SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
+    LATEX_PATH=/usr/local/texlive/2014/bin/x86_64-linux
 
     echo $$ > /var/run/sharelatex-$SERVICE.pid
     chdir /var/www/sharelatex/$SERVICE
-    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
+    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production PATH=$PATH:$LATEX_PATH $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
 end script

package/upstart/sharelatex-clsi

@@ -20,8 +20,9 @@ script
     # path to Node.js if it's not in your system PATH.
     NODE=node
     SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
+    LATEX_PATH=/usr/local/texlive/2014/bin/x86_64-linux
 
     echo $$ > /var/run/sharelatex-$SERVICE.pid
     chdir /var/www/sharelatex/$SERVICE
-    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
+    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production PATH=$PATH:$LATEX_PATH $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
 end script

package/upstart/sharelatex-docstore

@@ -20,8 +20,9 @@ script
     # path to Node.js if it's not in your system PATH.
     NODE=node
     SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
+    LATEX_PATH=/usr/local/texlive/2014/bin/x86_64-linux
 
     echo $$ > /var/run/sharelatex-$SERVICE.pid
     chdir /var/www/sharelatex/$SERVICE
-    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
+    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production PATH=$PATH:$LATEX_PATH $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
 end script

package/upstart/sharelatex-document-updater

@@ -20,8 +20,9 @@ script
     # path to Node.js if it's not in your system PATH.
     NODE=node
     SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
+    LATEX_PATH=/usr/local/texlive/2014/bin/x86_64-linux
 
     echo $$ > /var/run/sharelatex-$SERVICE.pid
     chdir /var/www/sharelatex/$SERVICE
-    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
+    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production PATH=$PATH:$LATEX_PATH $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
 end script

package/upstart/sharelatex-filestore

@@ -20,8 +20,9 @@ script
     # path to Node.js if it's not in your system PATH.
     NODE=node
     SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
+    LATEX_PATH=/usr/local/texlive/2014/bin/x86_64-linux
 
     echo $$ > /var/run/sharelatex-$SERVICE.pid
     chdir /var/www/sharelatex/$SERVICE
-    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
+    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production PATH=$PATH:$LATEX_PATH $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
 end script

package/upstart/sharelatex-spelling

@@ -20,8 +20,9 @@ script
     # path to Node.js if it's not in your system PATH.
     NODE=node
     SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
+    LATEX_PATH=/usr/local/texlive/2014/bin/x86_64-linux
 
     echo $$ > /var/run/sharelatex-$SERVICE.pid
     chdir /var/www/sharelatex/$SERVICE
-    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
+    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production PATH=$PATH:$LATEX_PATH $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
 end script

package/upstart/sharelatex-tags

@@ -20,8 +20,9 @@ script
     # path to Node.js if it's not in your system PATH.
     NODE=node
     SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
+    LATEX_PATH=/usr/local/texlive/2014/bin/x86_64-linux
 
     echo $$ > /var/run/sharelatex-$SERVICE.pid
     chdir /var/www/sharelatex/$SERVICE
-    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
+    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production PATH=$PATH:$LATEX_PATH $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
 end script

package/upstart/sharelatex-template

@@ -20,8 +20,9 @@ script
     # path to Node.js if it's not in your system PATH.
     NODE=node
     SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
+    LATEX_PATH=/usr/local/texlive/2014/bin/x86_64-linux
 
     echo $$ > /var/run/sharelatex-$SERVICE.pid
     chdir /var/www/sharelatex/$SERVICE
-    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
+    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production PATH=$PATH:$LATEX_PATH $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
 end script

package/upstart/sharelatex-track-changes

@@ -20,8 +20,9 @@ script
     # path to Node.js if it's not in your system PATH.
     NODE=node
     SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
+    LATEX_PATH=/usr/local/texlive/2014/bin/x86_64-linux
 
     echo $$ > /var/run/sharelatex-$SERVICE.pid
     chdir /var/www/sharelatex/$SERVICE
-    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
+    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production PATH=$PATH:$LATEX_PATH $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
 end script

package/upstart/sharelatex-web

@@ -20,8 +20,9 @@ script
     # path to Node.js if it's not in your system PATH.
     NODE=node
     SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
+    LATEX_PATH=/usr/local/texlive/2014/bin/x86_64-linux
 
     echo $$ > /var/run/sharelatex-$SERVICE.pid
     chdir /var/www/sharelatex/$SERVICE
-    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
+    exec sudo -u $USER -g $GROUP env SHARELATEX_CONFIG=$SHARELATEX_CONFIG NODE_ENV=production PATH=$PATH:$LATEX_PATH $NODE app.js >> /var/log/sharelatex/$SERVICE.log 2>&1
 end script