From dd36da1a45a12b08148672c8a019608ef133750c Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Fri, 2 Oct 2015 14:51:02 -0700
Subject: [PATCH] install script fixes

---
 INSTALL.debian                   |  7 +++++--
 config/unicorn/development.rb    | 25 +++++++++++++++++++++++++
 lib/capistrano/tasks/symlink.cap |  5 +++--
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 config/unicorn/development.rb

diff --git a/INSTALL.debian b/INSTALL.debian
index 2df2ebe8e..b6c5f12dc 100644
--- a/INSTALL.debian
+++ b/INSTALL.debian
@@ -91,8 +91,11 @@ sudo -u danbooru bash -l -c 'cd ~/danbooru ; bundle'
 echo "* Creating a new local git branch called develop"
 sudo -u danbooru bash -l -c 'cd ~/danbooru ; git checkout -b develop'
 
-mkdir -p /var/www/danbooru2
-chown danbooru:danbooru /var/www/danbooru2
+mkdir -p /var/www/danbooru2/shared/config
+mkdir -p /var/www/danbooru2/shared/data
+sudo -u danbooru bash -l -c 'cp ~/danbooru/script/install/database.yml.templ /var/www/danbooru2/shared/config/database.yml'
+sudo -u danbooru bash -l -c 'cp ~/danbooru/script/install/danbooru_local_config.rb.templ /var/www/danbooru2/shared/config/danbooru_local_config.rb'
+chown -R danbooru:danbooru /var/www/danbooru2
 
 echo "* Almost done! The code has been checked out at ~danbooru/danbooru. You can  "
 echo "* now login as the danbooru user and run the following commands to deploy to "
diff --git a/config/unicorn/development.rb b/config/unicorn/development.rb
new file mode 100644
index 000000000..a1f7a7517
--- /dev/null
+++ b/config/unicorn/development.rb
@@ -0,0 +1,25 @@
+# Set your full path to application.
+app_path = "/var/www/danbooru2/current"
+
+# Set unicorn options
+worker_processes 2
+
+preload_app false
+timeout 180
+listen "127.0.0.1:9000"
+
+# Spawn unicorn master worker for user apps (group: apps)
+user 'danbooru', 'danbooru'
+
+# Fill path to your app
+working_directory app_path
+
+# Should be 'production' by default, otherwise use other env 
+rails_env = ENV['RAILS_ENV'] || 'production'
+
+# Log everything to one file
+stderr_path "log/unicorn.log"
+stdout_path "log/unicorn.log"
+
+# Set master PID location
+pid "#{app_path}/tmp/pids/unicorn.pid"
diff --git a/lib/capistrano/tasks/symlink.cap b/lib/capistrano/tasks/symlink.cap
index 0bca02399..537577976 100644
--- a/lib/capistrano/tasks/symlink.cap
+++ b/lib/capistrano/tasks/symlink.cap
@@ -4,7 +4,9 @@ namespace :symlink do
     on roles(:app) do
       execute :ln, "-s", "#{deploy_to}/shared/config/danbooru_local_config.rb", "#{release_path}/config/danbooru_local_config.rb"
       execute :ln, "-s", "#{deploy_to}/shared/config/database.yml", "#{release_path}/config/database.yml"
-      execute :ln, "-s", "#{deploy_to}/shared/config/newrelic.yml", "#{release_path}/config/newrelic.yml"
+      if test("[ -f #{deploy_to}/shared/config/newrelic.yml ]")
+        execute :ln, "-s", "#{deploy_to}/shared/config/newrelic.yml", "#{release_path}/config/newrelic.yml"
+      end
     end
   end
 
@@ -13,7 +15,6 @@ namespace :symlink do
     on roles(:app) do
       execute :rm, "-f", "#{release_path}/public/data"
       execute :ln, "-s", "#{deploy_to}/shared/data", "#{release_path}/public/data"
-
       execute :mkdir, "-p", "#{release_path}/public/cache"
       execute :mkdir, "-p", "#{deploy_to}/shared/system/cache"
       execute :touch, "#{deploy_to}/shared/system/cache/tags.json"