From d79524d955f2df7bd127c1058263eb3297c14b80 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <nico@iMac-de-Nicolas.local>
Date: Wed, 14 Mar 2018 00:56:50 +0100
Subject: [PATCH] nouveau serveur

---
 config/deploy.rb  | 24 ++++++++++++------------
 config/env_init   |  7 +++++++
 config/nginx.conf | 12 ++++++------
 config/unicorn.rb | 10 +++++-----
 4 files changed, 30 insertions(+), 23 deletions(-)
 create mode 100644 config/env_init

diff --git a/config/deploy.rb b/config/deploy.rb
index 6a3ed35..e98a1b7 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,26 +1,26 @@
 set :application, 'pendragon_app' 
-	set :domain, 'pmr.quartz.xyz'
+	set :domain, '195.154.31.126'
 
 
 
   set :user, 'web'
-  set :scm_user, "git"
-  set :scm_host, "gitlab.quartz.xyz"
+  set :scm_user, "nicolas"
+  set :scm_host, "quartz.snlab.fr"
 
 
 
   set :rvm_ruby_string, 'ruby-2.1.2'           
   set :rvm_autolibs_flag, "read-only"      
 
-  set :bundle_cmd, "/home/#{user}/.rvm/gems/#{rvm_ruby_string}@global/bin/bundle"
-  set :bundle_dir, "/home/#{user}/.rvm/gems/#{rvm_ruby_string}"
+  set :bundle_cmd, "/srv/www/#{user}/.rvm/gems/#{rvm_ruby_string}@global/bin/bundle"
+  set :bundle_dir, "/srv/www/#{user}/.rvm/gems/#{rvm_ruby_string}"
   set :use_sudo, false
 
 
 
 
 
-  set :deploy_to, "/home/#{user}/#{application}/" 
+  set :deploy_to, "/srv/www/#{user}/#{application}/" 
   set :deploy_via, :remote_cache
 
   set :normalize_asset_timestamps, false
@@ -74,22 +74,22 @@ set :application, 'pendragon_app'
 
       run "ln -s #{deploy_to}shared/production.sqlite3 #{current_path}/db/production.sqlite3"
     
-      sudo "cp #{current_path}/config/unicorn_init_d /etc/init.d/#{application}"
+      sudo "cp #{current_path}/config/env_init #{deploy_to}env_init"
     
-      sudo "chmod +x /etc/init.d/#{application}"
-      sudo "update-rc.d #{application} defaults  "
+
     end
 
 
 
     task :start do 
-      sudo "service #{application} start"
+      sudo "systemctl start quartz_app@#{application}"
     end
     task :stop do 
-      run "service #{application} stop"  
+      sudo "systemctl stop quartz_app@#{application}"
     end
     task :restart do
-      sudo "service #{application} restart"
+      sudo "systemctl stop quartz_app@#{application}"
+      sudo "systemctl start quartz_app@#{application}"
     end
 
     task :reload_nginx do
diff --git a/config/env_init b/config/env_init
new file mode 100644
index 0000000..909ad05
--- /dev/null
+++ b/config/env_init
@@ -0,0 +1,7 @@
+
+APP_RUBY=2.1.2
+ENV=production
+APP_ROOT=/srv/www/web/nb_app/current/
+GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY
+UNICORN_OPTS="-D -E ${ENV} -c ${APP_ROOT}/config/unicorn.rb"
+
diff --git a/config/nginx.conf b/config/nginx.conf
index 416d11a..edb84dc 100644
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -1,11 +1,11 @@
 upstream pendragon_app_unicorn {
-	server unix:/home/web/pendragon_app/shared/unicorn.sock fail_timeout=0;
+	server unix:/srv/www/web/pendragon_app/shared/unicorn.sock fail_timeout=0;
 }
 
 server {
-	listen 80;
+	listen [::]:80;
 	server_name pendragon.quartz.xyz pendragon-international.com;
-	root /home/web/pendragon_app/current/public;
+	root /srv/www/web/pendragon_app/current/public;
 	try_files $uri/index.html $uri @unicorn;
 
 	location @unicorn {
@@ -21,9 +21,9 @@ server {
 }
 
 server {
-	listen 80;
-    server_name  www.pendragon-international.com pendragoninternational.com www.pendragoninternational.com;
-    rewrite ^(.*) http://pendragon-international.com permanent;
+	listen [::]:80;
+  server_name  www.pendragon-international.com pendragoninternational.com www.pendragoninternational.com;
+  rewrite ^(.*) http://pendragon-international.com permanent;
 }
 
 
diff --git a/config/unicorn.rb b/config/unicorn.rb
index a880356..ab58787 100644
--- a/config/unicorn.rb
+++ b/config/unicorn.rb
@@ -1,10 +1,10 @@
 @rails_app = "pendragon_app"
 
-working_directory "/home/web/#{@rails_app}/current"
-pid "/home/web/#{@rails_app}/shared/unicorn.pid"
-stderr_path "/home/web/#{@rails_app}/shared/log/unicorn.log"
-stdout_path "/home/web/#{@rails_app}/shared/log/unicorn.log"
+working_directory "/srv/www/web/#{@rails_app}/current"
+pid "/srv/www/web/#{@rails_app}/shared/unicorn.pid"
+stderr_path "/srv/www/web/#{@rails_app}/shared/log/unicorn.log"
+stdout_path "/srv/www/web/#{@rails_app}/shared/log/unicorn.log"
 
-listen "/home/web/#{@rails_app}/shared/unicorn.sock"
+listen "/srv/www/web/#{@rails_app}/shared/unicorn.sock"
 worker_processes 2
 timeout 30
\ No newline at end of file