suite
This commit is contained in:
Nicolas Bally
commit
520b0eca28
40
Gemfile.lock
40
Gemfile.lock
@ -88,6 +88,7 @@ GEM
|
||||
rails-dom-testing (>= 1, < 3)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
<<<<<<< HEAD
|
||||
kaminari (1.2.1)
|
||||
activesupport (>= 4.1.0)
|
||||
kaminari-actionview (= 1.2.1)
|
||||
@ -125,6 +126,34 @@ GEM
|
||||
mini_portile2 (~> 2.4.0)
|
||||
rack (1.6.13)
|
||||
rack-test (0.6.3)
|
||||
=======
|
||||
json (1.8.2)
|
||||
kaminari (0.16.1)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
kgio (2.9.2)
|
||||
libv8 (3.16.14.7)
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
mime-types (1.25.1)
|
||||
mini_portile (0.6.0)
|
||||
minitest (4.7.5)
|
||||
multi_json (1.10.1)
|
||||
mysql2 (0.3.16)
|
||||
net-scp (1.2.1)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-sftp (2.1.2)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh (2.7.0)
|
||||
net-ssh-gateway (1.2.0)
|
||||
net-ssh (>= 2.6.5)
|
||||
nokogiri (1.6.3.1)
|
||||
mini_portile (= 0.6.0)
|
||||
polyglot (0.3.5)
|
||||
rack (1.5.2)
|
||||
rack-test (0.6.2)
|
||||
>>>>>>> 3c5d04a5f5490c28273b38fd6fe819f8ed613a83
|
||||
rack (>= 1.0)
|
||||
rails (4.2.10)
|
||||
actionmailer (= 4.2.10)
|
||||
@ -150,6 +179,7 @@ GEM
|
||||
activesupport (= 4.2.10)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
<<<<<<< HEAD
|
||||
raindrops (0.19.1)
|
||||
rake (13.0.3)
|
||||
rdoc (6.3.1)
|
||||
@ -157,6 +187,16 @@ GEM
|
||||
rmagick (4.2.2)
|
||||
ruby_parser (3.15.1)
|
||||
sexp_processor (~> 4.9)
|
||||
=======
|
||||
raindrops (0.13.0)
|
||||
rake (10.3.2)
|
||||
rdoc (4.1.2)
|
||||
json (~> 1.4)
|
||||
ref (1.0.5)
|
||||
rmagick (2.13.4)
|
||||
rvm-capistrano (1.5.4)
|
||||
capistrano (~> 2.15.4)
|
||||
>>>>>>> 3c5d04a5f5490c28273b38fd6fe819f8ed613a83
|
||||
sass (3.2.19)
|
||||
sass-rails (4.0.5)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
|
||||
BIN
app/assets/images/logo-gold.png
Normal file
BIN
app/assets/images/logo-gold.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 37 KiB |
@ -4,21 +4,24 @@
|
||||
|
||||
|
||||
resize = () ->
|
||||
$(".electrolux_img .img").css("padding-top", ($(".electrolux_img").height() - $(".electrolux_img img").height())/ 2)
|
||||
$(".electrolux2_img .img").css("padding-top", ($(".electrolux2_img").height() - $(".electrolux2_img img").height())/ 2)
|
||||
$(".miele_img .img").css("padding-top", ($(".miele_img").height() - $(".miele_img img").height())/ 2)
|
||||
$(".gold_img .img").css("padding-top", ($(".gold_img").height() - $(".gold_img img").height())/ 2)
|
||||
|
||||
$(".with_ratio").each ->
|
||||
ratio = parseFloat($(this).data("ratio"))
|
||||
height = $(this).width()*ratio
|
||||
|
||||
$(this).css("height",height+"px")
|
||||
|
||||
|
||||
|
||||
$(".electrolux").css("margin-left", ($(window).width() - ($(".electrolux").width()*2))/ 3)
|
||||
$(".miele").css("margin-right", ($(window).width() - ($(".electrolux").width()*2))/ 3)
|
||||
|
||||
$(".row").css("top", ($(window).height() - $(".row").height())/ 2)
|
||||
#$(".panels").css("top", ($(window).height() - $(".row").height())/ 2)
|
||||
|
||||
$ ->
|
||||
resize()
|
||||
$(window).bind "resize", ->
|
||||
resize()
|
||||
|
||||
$(".electrolux, .miele").click (event) ->
|
||||
$(".electrolux2, .miele, .gold").click (event) ->
|
||||
window.location.href = $(this).find("a:first").attr("href")
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
# Place all the behaviors and hooks related to the matching controller here.
|
||||
# All this logic will automatically be available in application.js.
|
||||
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
|
||||
@ -1,3 +0,0 @@
|
||||
# Place all the behaviors and hooks related to the matching controller here.
|
||||
# All this logic will automatically be available in application.js.
|
||||
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
|
||||
@ -622,51 +622,67 @@ body{
|
||||
}
|
||||
|
||||
|
||||
.electrolux, .miele{
|
||||
box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.15);
|
||||
background:white;
|
||||
max-width:600px;
|
||||
margin:auto;
|
||||
.panel{
|
||||
box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.15);
|
||||
background:white;
|
||||
width:600px;
|
||||
margin:20px 20px;
|
||||
display:inline-block;
|
||||
max-width:90%;
|
||||
|
||||
&:hover{
|
||||
cursor:pointer;
|
||||
box-shadow: 0px 0px 15px 1px rgba(0,0,0,0.25);
|
||||
&:hover{
|
||||
cursor:pointer;
|
||||
box-shadow: 0px 0px 15px 1px rgba(0,0,0,0.25);
|
||||
|
||||
}
|
||||
.logo{
|
||||
float:left;
|
||||
margin:10px 10px;
|
||||
}
|
||||
.logo_container{
|
||||
background:rgba(0,0,0,0.9);
|
||||
}
|
||||
.img{
|
||||
margin:auto;
|
||||
display:block;
|
||||
padding:10px;
|
||||
height:100px;
|
||||
}
|
||||
.logo{
|
||||
float:left;
|
||||
margin:10px 10px;
|
||||
}
|
||||
|
||||
h3{
|
||||
margin:0px;
|
||||
padding:24px 10px;
|
||||
padding-right:20px;
|
||||
font-size:16px;
|
||||
text-align:right;
|
||||
}
|
||||
}
|
||||
|
||||
h3{
|
||||
margin:0px;
|
||||
padding:24px 10px;
|
||||
padding-right:20px;
|
||||
font-size:16px;
|
||||
text-align:right;
|
||||
}
|
||||
.panels{
|
||||
text-align:center;
|
||||
}
|
||||
|
||||
|
||||
.electrolux_img{
|
||||
|
||||
background:url("/laverie-electrolux.jpg")center center;
|
||||
|
||||
background-size:cover;
|
||||
height:350px;
|
||||
|
||||
&:hover{
|
||||
|
||||
|
||||
background:url("/laverie-electrolux2.jpg")center center;
|
||||
background-size:cover;
|
||||
}
|
||||
.img{
|
||||
width:396px;
|
||||
margin:auto;
|
||||
display:block;
|
||||
.electrolux2{
|
||||
.img{
|
||||
height:auto;
|
||||
width:250px;
|
||||
}
|
||||
}
|
||||
|
||||
.electrolux2_img{
|
||||
|
||||
background:url("/laverie-electrolux.jpg")center center;
|
||||
|
||||
background-size:cover;
|
||||
height:350px;
|
||||
|
||||
|
||||
.img{
|
||||
width:396px;
|
||||
margin:auto;
|
||||
display:block;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@ -688,13 +704,33 @@ height:350px;
|
||||
|
||||
|
||||
|
||||
&:hover{
|
||||
|
||||
|
||||
background:url("/laverie-miele2.jpg")center center;
|
||||
background-size:cover;
|
||||
.img{
|
||||
width:273px;
|
||||
margin:auto;
|
||||
display:block;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
.gold_img{
|
||||
.new{
|
||||
position:absolute;
|
||||
top:0px;
|
||||
right:0px;
|
||||
width:200px;
|
||||
|
||||
}
|
||||
position:relative;
|
||||
|
||||
background:url("/laverie-gold.jpg")center center;
|
||||
background-size:cover;
|
||||
height:350px;
|
||||
|
||||
|
||||
|
||||
.img{
|
||||
width:273px;
|
||||
margin:auto;
|
||||
@ -705,6 +741,8 @@ display:block;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
.auclair{
|
||||
background:url("/auclair_bg.jpg") ;
|
||||
background-size:cover;
|
||||
|
||||
@ -3,36 +3,50 @@
|
||||
-@keywords = "Laverie automatique,Laverie self service, acheter laverie, laverie libre service, franchise laverie, laveries libre service,lavomatique, laverie, libre-service, pressing, blanchisserie, laver, machine a laver, lavoir, linge, lavette, distributeur de lessive, lessive, centrale de paiement, monnayeur, miele, electrolux"
|
||||
|
||||
|
||||
|
||||
|
||||
.row
|
||||
|
||||
.header
|
||||
%h1 Créez votre laverie automatique avec les meilleures marques :
|
||||
.span_6.columns
|
||||
.electrolux
|
||||
.electrolux_img
|
||||
=link_to image_tag("logo-lux-laverie.png", :alt => "Acheter laverie automatique electrolux", :class => "img"), "http://luxlaverie.com", :title => "Laverie automatique Electrolux avec Lux Laverie"
|
||||
|
||||
.header
|
||||
%h1 Créez votre laverie automatique avec les meilleures marques :
|
||||
.panels
|
||||
.panel.electrolux2
|
||||
.logo_container=link_to image_tag("logo-lux-laverie.png", :alt => "Acheter laverie automatique electrolux", :class => "img"), "http://luxlaverie.com", :title => "Laverie automatique Electrolux avec Lux Laverie"
|
||||
.electrolux2_img.with_ratio{:data => {:ratio => 0.4}}
|
||||
|
||||
=link_to image_tag("logo-electrolux.png", :alt => "Installer laverie automatique electrolux", :class => "logo"), "http://luxlaverie.com", :title => "Lux Laverie, installation laverie automatique Electrolux"
|
||||
|
||||
=link_to image_tag("logo-electrolux.png", :alt => "Installer laverie automatique electrolux", :class => "logo"), "http://luxlaverie.com", :title => "Lux Laverie, installation laverie automatique Electrolux"
|
||||
|
||||
|
||||
%h3
|
||||
=link_to "Votre laverie équipée avec Electrolux", "http://luxlaverie.com", :title => "Lux Laverie, installation laverie automatique Electrolux"
|
||||
|
||||
|
||||
|
||||
|
||||
.panel.miele
|
||||
.logo_container=link_to image_tag("logo-une-autre-laverie.png", :alt => "Une autre laverie, laverie automatique Miele", :class => "img"), "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional"
|
||||
.miele_img.with_ratio{:data => {:ratio => 0.4}}
|
||||
|
||||
|
||||
%h3
|
||||
=link_to "Votre laverie équipée avec Electrolux", "http://luxlaverie.com", :title => "Lux Laverie, installation laverie automatique Electrolux"
|
||||
=link_to image_tag("logo-miele.png", :class => "logo", :alt => "Une autre laverie, laverie automatique Miele"), "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional"
|
||||
|
||||
|
||||
%h3
|
||||
=link_to "Votre laverie équipée avec Miele Professional", "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional"
|
||||
|
||||
|
||||
|
||||
.span_6.columns
|
||||
.miele
|
||||
.miele_img
|
||||
=link_to image_tag("nouveau.png", :alt => "Nouveau : Une autre laverie, laverie automatique Miele", :class => "new"), "http://une-autre-laverie.com", :title => "Nouveau : Une autre laverie, laverie automatique Miele"
|
||||
=link_to image_tag("logo-une-autre-laverie.png", :alt => "Une autre laverie, laverie automatique Miele", :class => "img"), "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional"
|
||||
=link_to image_tag("logo-miele.png", :class => "logo", :alt => "Une autre laverie, laverie automatique Miele"), "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional"
|
||||
|
||||
|
||||
%h3
|
||||
=link_to "Votre laverie équipée avec Miele Professional", "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional"
|
||||
.panel.gold
|
||||
.logo_container=link_to image_tag("logo-gold.png", :alt => "Acheter laverie automatique electrolux", :class => "img"), "https://gold-laverie.com/", :title => "Laverie automatique Electrolux avec Gold Laverie"
|
||||
.gold_img.with_ratio{:data => {:ratio => 0.4}}
|
||||
=link_to image_tag("nouveau.png", :alt => "Acheter laverie automatique electrolux", :class => "new"), "http://une-autre-laverie.com", :title => "Laverie automatique Electrolux avec Gold Laverie"
|
||||
|
||||
|
||||
=link_to image_tag("logo-electrolux.png", :alt => "Installer laverie automatique electrolux", :class => "logo"), "https://gold-laverie.com/", :title => "Gold Laverie, installation laverie automatique Electrolux"
|
||||
|
||||
|
||||
%h3
|
||||
=link_to "Votre laverie équipée avec Electrolux", "https://gold-laverie.com/", :title => "Gold Laverie, installation laverie automatique Electrolux"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,26 +1,26 @@
|
||||
|
||||
|
||||
set :application, 'laverie_app'
|
||||
set :domain, '62.210.187.249'
|
||||
set :domain, 'quartz-www02.sysnove.net'
|
||||
|
||||
|
||||
|
||||
set :user, 'web'
|
||||
set :scm_user, "git"
|
||||
set :scm_host, "gitlab.bally.me"
|
||||
set :scm_host, "quartz.snlab.fr"
|
||||
|
||||
|
||||
|
||||
set :rvm_ruby_string, 'ruby-2.1.2@ual'
|
||||
set :rvm_ruby_string, 'ruby-2.1.2'
|
||||
set :rvm_autolibs_flag, "read-only"
|
||||
|
||||
#set :bundle_cmd, "/home/#{user}/.rvm/gems/#{rvm_ruby_string}/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
|
||||
@ -33,7 +33,7 @@ role :db, domain, :primary => true
|
||||
|
||||
set :scm, :git
|
||||
|
||||
set :repository, "#{scm_user}@#{scm_host}:root/#{application}.git"
|
||||
set :repository, "#{scm_user}@#{scm_host}:nicolas/#{application}.git"
|
||||
|
||||
set :branch, "master"
|
||||
|
||||
@ -49,7 +49,7 @@ require 'bundler/capistrano'
|
||||
load 'deploy/assets'
|
||||
|
||||
namespace :deploy do
|
||||
|
||||
|
||||
# namespace :assets do
|
||||
# task :precompile, :roles => :web, :except => { :no_release => true } do
|
||||
# from = source.next_revision(current_revision)
|
||||
@ -60,42 +60,47 @@ namespace :deploy do
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
desc "Symlink shared config files"
|
||||
task :symlink_config_files do
|
||||
|
||||
|
||||
|
||||
|
||||
run "ln -s #{deploy_to}shared/storage/private #{current_path}/private_medias"
|
||||
|
||||
run "ln -s #{deploy_to}shared/storage/public #{current_path}/public/public_medias"
|
||||
|
||||
|
||||
run "ln -s #{deploy_to}shared/production.sqlite3 #{current_path}/db/production.sqlite3"
|
||||
|
||||
sudo "cp #{current_path}/config/env_init #{deploy_to}env_init"
|
||||
|
||||
sudo "cp #{current_path}/config/unicorn_init_d /etc/init.d/#{application}"
|
||||
sudo "sudo systemctl enable quartz_app@#{application}"
|
||||
|
||||
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
|
||||
|
||||
|
||||
sudo "rm -rf /etc/nginx/sites-enabled/#{application}"
|
||||
sudo "ln -s #{current_path}/config/nginx.conf /etc/nginx/sites-enabled/#{application} "
|
||||
|
||||
|
||||
sudo "service nginx reload"
|
||||
end
|
||||
|
||||
@ -105,24 +110,24 @@ namespace :deploy do
|
||||
run "cd #{deploy_to}current && rake db:seed RAILS_ENV=#{rails_env}"
|
||||
|
||||
end
|
||||
|
||||
|
||||
|
||||
task :create_files_folders do
|
||||
|
||||
|
||||
run "mkdir #{deploy_to}shared/storage"
|
||||
run "mkdir #{deploy_to}shared/storage/private"
|
||||
run "mkdir #{deploy_to}shared/storage/public"
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
end
|
||||
|
||||
|
||||
#before 'deploy:setup', 'rvm:install_rvm' # install RVM
|
||||
#before 'deploy:setup', 'rvm:install_ruby' # install Ruby and create gemset, OR:
|
||||
#before 'deploy:setup', 'rvm:create_gemset' # only create gemset
|
||||
|
||||
|
||||
|
||||
|
||||
after "deploy:setup", "deploy:create_files_folders"
|
||||
@ -135,4 +140,7 @@ before "deploy:restart", "deploy:symlink_config_files"
|
||||
after "deploy", "deploy:cleanup"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
7
config/env_init
Normal file
7
config/env_init
Normal file
@ -0,0 +1,7 @@
|
||||
|
||||
APP_RUBY=2.1.2
|
||||
ENV=production
|
||||
APP_ROOT=/srv/www/web/laverie_app/current/
|
||||
GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY
|
||||
UNICORN_OPTS="-D -E ${ENV} -c ${APP_ROOT}/config/unicorn.rb"
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
upstream laverie_app_unicorn {
|
||||
server unix:/home/web/laverie_app/shared/unicorn.sock fail_timeout=0;
|
||||
server unix:/srv/www/web/laverie_app/shared/tmp/unicorn.sock fail_timeout=0;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name laverieautomatique.fr;
|
||||
root /home/web/laverie_app/current/public;
|
||||
listen [::]:443 ssl;
|
||||
server_name laverieautomatique.fr;
|
||||
root /srv/www/web/laverie_app/current/public;
|
||||
try_files $uri/index.html $uri @unicorn;
|
||||
|
||||
location @unicorn {
|
||||
@ -13,16 +13,45 @@ server {
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_redirect off;
|
||||
proxy_pass http://laverie_app_unicorn;
|
||||
proxy_read_timeout 6000;
|
||||
}
|
||||
|
||||
error_page 500 502 503 504 /500.html;
|
||||
client_max_body_size 4G;
|
||||
keepalive_timeout 10;
|
||||
|
||||
ssl on;
|
||||
ssl_certificate /etc/letsencrypt/live/laverieautomatique.fr/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/laverieautomatique.fr/privkey.pem;
|
||||
|
||||
|
||||
include snippets/letsencrypt.conf;
|
||||
}
|
||||
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name www.laverieautomatique.fr;
|
||||
rewrite ^(.*) http://laverieautomatique.fr$1 permanent;
|
||||
listen [::]:443 ssl;
|
||||
server_name www.laverieautomatique.fr;
|
||||
ssl on;
|
||||
ssl_certificate /etc/letsencrypt/live/laverieautomatique.fr/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/laverieautomatique.fr/privkey.pem;
|
||||
|
||||
return 301 https://laverieautomatique.fr$request_uri;
|
||||
|
||||
include snippets/letsencrypt.conf;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
server {
|
||||
listen [::]:80;
|
||||
server_name laverieautomatique.fr www.laverieautomatique.fr;
|
||||
rewrite ^(.*) https://laverieautomatique.fr$1 permanent;
|
||||
|
||||
|
||||
include snippets/letsencrypt.conf;
|
||||
}
|
||||
|
||||
|
||||
|
||||
28
config/nginx.conf2
Normal file
28
config/nginx.conf2
Normal file
@ -0,0 +1,28 @@
|
||||
upstream laverie_app_unicorn {
|
||||
server unix:/home/web/laverie_app/shared/unicorn.sock fail_timeout=0;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name laverieautomatique.fr;
|
||||
root /home/web/laverie_app/current/public;
|
||||
try_files $uri/index.html $uri @unicorn;
|
||||
|
||||
location @unicorn {
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_redirect off;
|
||||
proxy_pass http://laverie_app_unicorn;
|
||||
}
|
||||
|
||||
error_page 500 502 503 504 /500.html;
|
||||
client_max_body_size 4G;
|
||||
keepalive_timeout 10;
|
||||
}
|
||||
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name www.laverieautomatique.fr;
|
||||
rewrite ^(.*) http://laverieautomatique.fr$1 permanent;
|
||||
}
|
||||
@ -1,10 +1,11 @@
|
||||
# -*- encoding : utf-8 -*-
|
||||
@rails_app = "laverie_app"
|
||||
|
||||
working_directory "/home/web/#{@rails_app}/current"
|
||||
pid "/home/web/#{@rails_app}/shared/unicorn.pid"
|
||||
stderr_path "/home/web/#{@rails_app}/shared/unicorn.log"
|
||||
stdout_path "/home/web/#{@rails_app}/shared/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/tmp/unicorn.sock"
|
||||
worker_processes 2
|
||||
timeout 30
|
||||
timeout 600
|
||||
|
||||
8
config/unicorn_init_d
Normal file → Executable file
8
config/unicorn_init_d
Normal file → Executable file
@ -6,12 +6,12 @@ set -e
|
||||
|
||||
# Change these to match your app:
|
||||
APP_NAME=laverie_app
|
||||
APP_RUBY=2.1.2@ual
|
||||
APP_ROOT="/home/web/laverie_app/current"
|
||||
PID="/home/web/laverie_app/shared/unicorn.pid"
|
||||
APP_RUBY=ruby-2.1.2
|
||||
APP_ROOT="/srv/www/web/laverie_app/current"
|
||||
PID="/srv/www/web/laverie_app/shared/unicorn.pid"
|
||||
ENV=production
|
||||
|
||||
GEM_HOME="/home/web/laverie_app/shared/bundle/ruby/2.1.0"
|
||||
GEM_HOME="/srv/www/web/.rvm/gems/ruby-$APP_RUBY"
|
||||
|
||||
UNICORN_OPTS="-D -E $ENV -c $APP_ROOT/config/unicorn.rb"
|
||||
|
||||
|
||||
BIN
public/laverie-gold.jpg
Normal file
BIN
public/laverie-gold.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 235 KiB |
BIN
public/laverie-gold2.jpg
Normal file
BIN
public/laverie-gold2.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 65 KiB |
Loading…
x
Reference in New Issue
Block a user