From 4d4ee3aa59b48965b90f0033d6b212e2fad9c546 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Tue, 26 Oct 2021 09:40:44 +0200 Subject: [PATCH] =?UTF-8?q?Passage=20de=20presta=5Fapp=20=C3=A0=20arcom=5F?= =?UTF-8?q?app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admin/dashboards/commercial.html.haml | 12 ++++++------ config/cable.yml | 2 +- config/database.yml | 8 ++++---- config/deploy.rb | 2 +- config/deploy/nginx.conf.erb | 10 +++++----- config/deploy/production.rb | 2 +- config/env_init | 2 +- config/environments/production.rb | 2 +- config/nginx.conf | 8 ++++---- config/qi.yml | 2 +- config/unicorn.rb | 2 +- package-lock.json | 2 +- package.json | 2 +- package.json.old | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/views/admin/dashboards/commercial.html.haml b/app/views/admin/dashboards/commercial.html.haml index 047efd4..0466816 100644 --- a/app/views/admin/dashboards/commercial.html.haml +++ b/app/views/admin/dashboards/commercial.html.haml @@ -908,7 +908,7 @@ %th %tbody - /* 11:18:50 localhost presta_app */ SELECT COUNT(1) FROM `order_hist_lines`; + /* 11:18:50 localhost arcom_app */ SELECT COUNT(1) FROM `order_hist_lines`; -#@periode_price_lines.select("p_product_ref_id, SUM(cc_tot_amount_ht) AS cc_tot_amount_ht, SUM(cc_weight_tot) AS cc_weight_tot, ((SELECT weight FROM `p_product_refs` WHERE id = price_lines.p_product_ref_id )) AS price_per_kg").group(:p_product_ref_id).order("cc_tot_amount_ht DESC").each do |ppp| @@ -1014,7 +1014,7 @@ %th %tbody - /* 11:18:50 localhost presta_app */ SELECT COUNT(1) FROM `order_hist_lines`; + /* 11:18:50 localhost arcom_app */ SELECT COUNT(1) FROM `order_hist_lines`; -#@periode_price_lines.select("p_product_ref_id, SUM(tot_amount_ht) AS tot_amount_ht, SUM(weight_tot) AS weight_tot, ((SELECT weight FROM `p_product_refs` WHERE id = price_lines.p_product_ref_id )) AS price_per_kg").group(:p_product_ref_id).order("tot_amount_ht DESC").each do |ppp| @@ -1096,7 +1096,7 @@ %tbody - /* 11:18:50 localhost presta_app */ SELECT COUNT(1) FROM `order_hist_lines`; + /* 11:18:50 localhost arcom_app */ SELECT COUNT(1) FROM `order_hist_lines`; -#@periode_price_lines.select("p_product_ref_id, SUM(cc_tot_amount_ht) AS cc_tot_amount_ht, SUM(cc_weight_tot) AS cc_weight_tot, ((SELECT weight FROM `p_product_refs` WHERE id = price_lines.p_product_ref_id )) AS price_per_kg").group(:p_product_ref_id).order("cc_tot_amount_ht DESC").each do |ppp| @@ -1165,7 +1165,7 @@ %th %tbody - /* 11:18:50 localhost presta_app */ SELECT COUNT(1) FROM `order_hist_lines`; + /* 11:18:50 localhost arcom_app */ SELECT COUNT(1) FROM `order_hist_lines`; -#@periode_price_lines.select("p_product_ref_id, SUM(cc_tot_amount_ht) AS cc_tot_amount_ht, SUM(cc_weight_tot) AS cc_weight_tot, ((SELECT weight FROM `p_product_refs` WHERE id = price_lines.p_product_ref_id )) AS price_per_kg").group(:p_product_ref_id).order("cc_tot_amount_ht DESC").each do |ppp| @@ -1263,7 +1263,7 @@ %th.numeraire CA Moyen famille / client %tbody - /* 11:18:50 localhost presta_app */ SELECT COUNT(1) FROM `order_hist_lines`; + /* 11:18:50 localhost arcom_app */ SELECT COUNT(1) FROM `order_hist_lines`; -#@periode_price_lines.select("p_product_ref_id, SUM(cc_tot_amount_ht) AS cc_tot_amount_ht, SUM(cc_weight_tot) AS cc_weight_tot, ((SELECT weight FROM `p_product_refs` WHERE id = price_lines.p_product_ref_id )) AS price_per_kg").group(:p_product_ref_id).order("cc_tot_amount_ht DESC").each do |ppp| @@ -1359,7 +1359,7 @@ %th.numeraire CA Moyen famille / client %tbody - /* 11:18:50 localhost presta_app */ SELECT COUNT(1) FROM `order_hist_lines`; + /* 11:18:50 localhost arcom_app */ SELECT COUNT(1) FROM `order_hist_lines`; -#@periode_price_lines.select("p_product_ref_id, SUM(cc_tot_amount_ht) AS cc_tot_amount_ht, SUM(cc_weight_tot) AS cc_weight_tot, ((SELECT weight FROM `p_product_refs` WHERE id = price_lines.p_product_ref_id )) AS price_per_kg").group(:p_product_ref_id).order("cc_tot_amount_ht DESC").each do |ppp| diff --git a/config/cable.yml b/config/cable.yml index 3ac8c9d..8a27c23 100644 --- a/config/cable.yml +++ b/config/cable.yml @@ -7,4 +7,4 @@ test: production: adapter: redis url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> - channel_prefix: presta_app_production + channel_prefix: arcom_app_production diff --git a/config/database.yml b/config/database.yml index b7f85f0..82b3eac 100644 --- a/config/database.yml +++ b/config/database.yml @@ -7,7 +7,7 @@ default: &default adapter: mysql2 encoding: utf8mb4 - database: presta_app + database: arcom_app pool: 5 timeout: 5000 variables: @@ -27,7 +27,7 @@ test: production: <<: *default - database: presta_app - username: presta_app - password: presta_app + database: arcom_app + username: arcom_app + password: arcom_app socket: /var/run/mysqld/mysqld.sock diff --git a/config/deploy.rb b/config/deploy.rb index 30755ab..5ede5a4 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -4,7 +4,7 @@ lock "~> 3.11.0" -set :application, 'presta_app' +set :application, 'arcom_app' set :domain, 'quartz-www02.sysnove.net' diff --git a/config/deploy/nginx.conf.erb b/config/deploy/nginx.conf.erb index fe22353..f26c454 100644 --- a/config/deploy/nginx.conf.erb +++ b/config/deploy/nginx.conf.erb @@ -1,18 +1,18 @@ -upstream presta_app_unicorn { - server unix:/srv/www/web/presta_app/shared/unicorn.sock fail_timeout=0; +upstream arcom_app_unicorn { + server unix:/srv/www/web/arcom_app/shared/unicorn.sock fail_timeout=0; } server { listen [::]:80; - server_name presta_app.quartz.xyz ; - root /srv/www/web/presta_app/current/public; + server_name arcom_app.quartz.xyz ; + root /srv/www/web/arcom_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://presta_app_unicorn; + proxy_pass http://arcom_app_unicorn; proxy_read_timeout 6000; } diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 9a45870..af2f022 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -121,7 +121,7 @@ namespace :deploy do sudo "service nginx reload" execute "cd #{current_path}" - execute "cd /srv/www/web/presta_app/current; npm install" + execute "cd /srv/www/web/arcom_app/current; npm install" end diff --git a/config/env_init b/config/env_init index 2cf328a..bd7310b 100644 --- a/config/env_init +++ b/config/env_init @@ -1,7 +1,7 @@ APP_RUBY=2.6.0 ENV=production -APP_ROOT=/srv/www/web/presta_app/current/ +APP_ROOT=/srv/www/web/arcom_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/environments/production.rb b/config/environments/production.rb index 0c7f053..362c0f0 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -61,7 +61,7 @@ Rails.application.configure do # Use a real queuing backend for Active Job (and separate queues per environment). # config.active_job.queue_adapter = :resque - # config.active_job.queue_name_prefix = "presta_app_production" + # config.active_job.queue_name_prefix = "arcom_app_production" config.action_mailer.perform_caching = false diff --git a/config/nginx.conf b/config/nginx.conf index 224c07c..1e12e16 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -1,6 +1,6 @@ -upstream presta_app_unicorn { - server unix:/srv/www/web/presta_app/shared/unicorn.sock fail_timeout=0; +upstream arcom_app_unicorn { + server unix:/srv/www/web/arcom_app/shared/unicorn.sock fail_timeout=0; } @@ -11,14 +11,14 @@ upstream presta_app_unicorn { server { listen [::]:443 ssl; server_name arcom.basiclabs.fr; - root /srv/www/web/presta_app/current/public; + root /srv/www/web/arcom_app/current/public; try_files $uri/index.html $uri @unicorn; location @unicorn { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; #proxy_redirect off; - proxy_pass http://presta_app_unicorn; + proxy_pass http://arcom_app_unicorn; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/config/qi.yml b/config/qi.yml index 43eaeda..46f4169 100644 --- a/config/qi.yml +++ b/config/qi.yml @@ -1,5 +1,5 @@ defaults: &defaults - site_name: presta_app + site_name: arcom_app dynamics_content: contact: "Formulaire contact" large_sub_menu: "Sous menu" diff --git a/config/unicorn.rb b/config/unicorn.rb index 3b2cd1a..df35e2b 100644 --- a/config/unicorn.rb +++ b/config/unicorn.rb @@ -1,4 +1,4 @@ -@rails_app = "presta_app" +@rails_app = "arcom_app" working_directory "/srv/www/web/#{@rails_app}/current" pid "/srv/www/web/#{@rails_app}/shared/unicorn.pid" diff --git a/package-lock.json b/package-lock.json index 25a30e8..3156065 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "presta_app", + "name": "arcom_app", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index cc8a8c8..7cd2e3e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "presta_app", + "name": "arcom_app", "version": "1.0.0", "description": "== README", "main": "pdf.js", diff --git a/package.json.old b/package.json.old index c05f1d1..66058c8 100644 --- a/package.json.old +++ b/package.json.old @@ -1,5 +1,5 @@ { - "name": "presta_app", + "name": "arcom_app", "private": true, "dependencies": { "@rails/actioncable": "^6.0.0-alpha",