fix apps folder

e2c33db4 · nabil el mahiri · 21046be5 · e2c33db4 · e2c33db4 · e2c33db4
Commit e2c33db4 authored Mar 14, 2019 by nabil el mahiri
Showing with 13 additions and 66 deletions

.gitlab-ci.yml
+1 -1

apps/atlas-voyages/etc/conf.dev.json
+1 -2

apps/atlas-voyages/etc/nginx/nginx.dev.conf
+6 -4

nginx/default.conf
+5 -2

npm-debug.log.2482745856
+0 -0

package-local.json
+0 -57

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ deploy:
  script:
    - chmod +x sh/run.sh
    - sh sh/run.sh
-    - docker run -d -p 7778:0.0.0.0:7778  --name atlasvoyages-docker-prod atlasvoyages-docker:prod
+    - docker run -d -p 7778:80  --name atlasvoyages-docker-prod atlasvoyages-docker:prod
    - sh sh/clean.sh

 # build:

--- a/apps/atlas-voyages/etc/conf.dev.json
+++ b/apps/atlas-voyages/etc/conf.dev.json
 {
    "http": { 
-        "url": "localhost:7778",
-        "socket": true,
+        "socket": false,
        "middleware": {
            "session": {
                "secret": "c1Ee9)5c@d15Zb(b7129"

--- a/apps/atlas-voyages/etc/nginx/nginx.dev.conf
+++ b/apps/atlas-voyages/etc/nginx/nginx.dev.conf
 # NGINX CONF ATLAS VOYAGES

 upstream node_atlasvoyage_de {
-   server unix:/Users/hotelia/nodejs/atlasvoyages.com/apps/atlas-voyages/http.sock;
+  #  server unix:/Users/hotelia/nodejs/atlasvoyages.com/apps/atlas-voyages/http.sock;
+  #  server unix:/atlasvoyages/apps/atlas-voyages/http.sock;
+   server localhost:3990;
 }

 server {
- listen 7778; 
- 
- set $public /Users/hotelia/nodejs/atlasvoyages.com/apps/atlas-voyages/public;
+  listen 80 default_server;
+  listen [::]:80 default_server;

+ set $public /atlasvoyages/apps/atlas-voyages/public;

 #access_log /Users/hotelia/atlasvoyages/pine-server-old/logs/atlas-voyages.access.log;
 #error_log /Users/hotelia/atlasvoyages/pine-server-old/logs/atlas-voyages.error.log;

--- a/nginx/default.conf
+++ b/nginx/default.conf
 # NGINX CONF ATLAS VOYAGES

 upstream node_atlasvoyage_de {
-   server unix:/atlasvoyages/apps/atlas-voyages/http.sock;
+  #  server unix:/atlasvoyages/apps/atlas-voyages/http.sock;
+   server localhost:7778;
 }

 server { 
- listen 7778; 
+ listen 80 default_server;
+ listen [::]:80 default_server;
+
 set $public /atlasvoyages/apps/atlas-voyages/public;



--- a/npm-debug.log.2482745856
+++ b/npm-debug.log.2482745856
--- a/package-local.json
+++ b/package-local.json
-{
-  "name": "atlasvoyages.com",
-  "version": "0.0.2",
-  "description": "Atlas Voyages, leader du voyage au Maroc: plus de 300 000 hôtels au Maroc et dans le monde, billets d'avion, voyages organisés, Omra, Club Med, croisières. Paiement en Dirhams.",
-  "main": "index.js",
-  "author": "Fractalite",
-  "license": "UNLICENSED",
-  "dependencies": {
-    "pine": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine.git#0.3",
-    "pine-express": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-express.git#0.3-dev",
-    "pine-mongo": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-mongo.git#0.3",
-    "pine-blocks": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-blocks.git#0.3",
-    "pine-angular": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-angular.git#0.3",
-    "pine-access": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-access.git#0.3",
-    "pine-admin": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-admin.git#0.3",
-    "pine-urls": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-urls.git#0.3",
-    "pine-checkout": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-checkout.git#0.3",
-    "pine-analytics": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-analytics.git#0.3",
-    "pine-hermes": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine-hermes/pine-hermes.git#0.3",
-    "pine-hermes-air": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine-hermes/pine-hermes-air.git#0.3-baggage",
-    "pine-hermes-lodge": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine-hermes/pine-hermes-lodge.git#0.4-fix-hotel-dest",
-    "pine-payzone": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-payzone.git#0.3",
-    "pine-payments": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-payments.git#0.3",
-    "pine-i18n": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-i18n.git#0.3-newdev",
-    "pine-avi-extra": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-avi-extras.git#master",
-    "hermes-tour": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/tour/hermes-tour.git#v0.2",
-    "hermes-travel": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-travel.git#0.3-beta-v1",
-    "theme-atlasvoyages": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/theme-atlasvoyages.git#0.3-beta-v1",
-    "pine-redis": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-redis.git#0.3-newdev",
-    "async": "^0.7.0",
-    "connect-redis": "1.4.7",
-    "extend": "~1.2.1",
-    "grunt-contrib-copy": "~0.5.0",
-    "grunt-newer": "~0.7.0",
-    "jayschema": "~0.2.7",
-    "q": "^1.1.2",
-    "request": "^2.55.0",
-    "simple-lru-cache": "^0.0.1",
-    "winston": "^0.7.2"
-    
-  },
-  "devDependencies": {
-    "grunt": "~0.4.4",
-    "grunt-bump": "0.0.13",
-    "grunt-concurrent": "~0.5.0",
-    "grunt-contrib-watch": "~0.6.1",
-    "grunt-exit": "~1.0.0",
-    "grunt-nodemon": "~0.3.0",
-    "grunt-prompt": "^1.3.0",
-    "grunt-shell": "~0.7.0",
-    "handlebars": "^2.0.0",
-    "load-grunt-tasks": "~0.3.0",
-    "nginx-conf": "~0.2.3",
-    "parent-require": "~1.0.0"
-  }
-}
\ No newline at end of file