Просмотр исходного кода

Generate Secret keys properly and start services on boot

James Allen 12 лет назад
Родитель
Сommit
c2ebfcc23e
3 измененных файлов с 5 добавлено и 4 удалено
  1. 3 3
      Gruntfile.coffee
  2. 1 0
      Vagrantfile
  3. 1 1
      package/upstart/sharelatex-template

+ 3 - 3
Gruntfile.coffee

@@ -415,9 +415,9 @@ module.exports = (grunt) ->
 
 			after_install_script = """
 				#!/bin/sh
-				# Create random secret keys
-				sed -i "s/CRYPTO_RANDOM/$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 64 | head -n 1)/" /etc/sharelatex/settings.coffee
-				sed -i "s/CRYPTO_RANDOM/$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 64 | head -n 1)/" /etc/sharelatex/settings.coffee
+				# Create random secret keys (twice, once for http auth pass, once for cookie secret).
+				sed -i "0,/CRYPTO_RANDOM/s/CRYPTO_RANDOM/$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 64 | head -n 1)/" /etc/sharelatex/settings.coffee
+				sed -i "0,/CRYPTO_RANDOM/s/CRYPTO_RANDOM/$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 64 | head -n 1)/" /etc/sharelatex/settings.coffee
 				
 				sudo adduser --system --group --home /var/www/sharelatex --no-create-home sharelatex
 

+ 1 - 0
Vagrantfile

@@ -9,6 +9,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box_url = "http://files.vagrantup.com/precise64.box"
 
   config.vm.network :forwarded_port, guest: 3000, host: 3000
+  config.vm.network :forwarded_port, guest: 80, host: 8080
 
   config.ssh.forward_agent = true
 

+ 1 - 1
package/upstart/sharelatex-template

@@ -1,7 +1,7 @@
 description "sharelatex-web"
 author      "ShareLaTeX <team@sharelatex.com>"
 
-start on started mountall
+start on (local-filesystems and net-device-up IFACE!=lo)
 stop on shutdown
 
 respawn