dsfdsf

docker/docker-compose-dev.yml

@@ -1,6 +1,6 @@
 version: "3.1"
 services:
-  bro-nginx:
+  nginx:
     image: nginx:alpine
     container_name: bro-nginx
     ports:
@@ -10,28 +10,28 @@ services:
       - ./nginx/spiduler.conf:/etc/nginx/conf.d/default.conf
     restart: unless-stopped    
     depends_on:
-      - bro-gateway
+      - gateway
 
-  bro-gateway:
+  gateway:
     image: node:lts-alpine
     container_name: bro-gateway
     volumes:
       - ../../:/var/www/spiduler
-    entrypoint: node /var/www/spiduler/spd-app-gateway --env development --redis ibpcorp.c-xtra.com:49023 --mongo ibpcorp.c-xtra.com:49024 --gateway bro-nginx:80 --quix24 ibpcorp-nginx:31000
+    entrypoint: node /var/www/spiduler/bro-app-gateway
     restart: unless-stopped     
 
-  bro-browser: 
+  browser: 
     image: node:lts-alpine    
     container_name: bro-browser
     volumes:
       - ../../:/var/www/spiduler
-    entrypoint: node /var/www/spiduler/spd-app-browser --env development --redis ibpcorp.c-xtra.com:49023 --mongo ibpcorp.c-xtra.com:49024 --gateway bro-nginx:80 --quix24 ibpcorp-nginx:31000
+    entrypoint: node /var/www/spiduler/bro-app-browser
     restart: unless-stopped    
     depends_on:
-      - bro-nginx
+      - nginx
-      - bro-chrome
+      - chrome
 
-  bro-tor:
+  tor:
     image: dperson/torproxy
     container_name: bro-tor    
     hostname: bro-tor      
@@ -39,7 +39,7 @@ services:
     shm_size: 2g
     restart: unless-stopped    
 
-  bro-chrome:
+  chrome:
     image: selenium/standalone-chrome
     container_name: bro-chrome    
     hostname: bro-chrome  
@@ -56,3 +56,4 @@ services:
 networks:
   default:      
     name: bro
+    external: true

docker/elk/docker-compose.yml

@@ -23,8 +23,6 @@ services:
       # Use single node discovery in order to disable production mode and avoid bootstrap checks.
       # see: https://www.elastic.co/guide/en/elasticsearch/reference/current/bootstrap-checks.html
       discovery.type: single-node
-    networks:
-      - elk
 
   logstash:
     build:
@@ -46,9 +44,7 @@ services:
       - "5000:5000/udp"
       - "9600:9600"
     environment:
-      LS_JAVA_OPTS: "-Xmx256m -Xms256m"
+      LS_JAVA_OPTS: "-Xmx256m -Xms256m"    
-    networks:
-      - elk
     depends_on:
       - elasticsearch
 
@@ -63,15 +59,14 @@ services:
         target: /usr/share/kibana/config/kibana.yml
         read_only: true
     ports:
-      - "5601:5601"
+      - "5601:5601"    
-    networks:
-      - elk
     depends_on:
       - elasticsearch
 
 networks:
-  elk:
+  default:
-    driver: bridge
+    name: bro
+    external: true
 
 volumes:
   elasticsearch:

docker/elk/logstash/pipeline/logstash.conf

@@ -1,10 +1,40 @@
 input {
-##	beats {
+	##	beats {
-##		port => 5044
+	##		port => 5044
-##	}
+	##	}
 
-	tcp {
+	# tcp {
-		port => 5000
+	# 	port => 5000
+	# }
+
+	rabbitmq {
+		host => "ibpcorp.c-xtra.com:49072"
+		queue => "web.debug"
+		user => "ibpcorp"
+		password => "KjUuC754D5xTSpqf"
+		threads => 1
+		vhost => "ibpcorp"
+		passive => true
+	}
+
+	rabbitmq {
+		host => "ibpcorp.c-xtra.com:49072"
+		queue => "web.error"
+		user => "ibpcorp"
+		password => "KjUuC754D5xTSpqf"
+		threads => 1
+		vhost => "ibpcorp"
+		passive => true
+	}
+
+	rabbitmq {
+		host => "ibpcorp.c-xtra.com:49072"
+		queue => "web.info"
+		user => "ibpcorp"
+		password => "KjUuC754D5xTSpqf"
+		threads => 1
+		vhost => "ibpcorp"
+		passive => true
 	}
 }
 

github/config.sh

@@ -0,0 +1,8 @@
+git -C bro-app-devopts config user.name brow3c
+git -C bro-app-devopts config user.email browserw3c@gmail.com
+
+git -C bro-app-gateway config user.name brow3c
+git -C bro-app-gateway config user.email browserw3c@gmail.com
+
+git -C bro-app-browser config user.name brow3c
+git -C bro-app-browser config user.email browserw3c@gmail.com

github/pull.sh

@@ -0,0 +1,3 @@
+git -C bro-app-devopts pull origin master
+git -C bro-app-gateway pull origin master
+git -C bro-app-browser pull origin master

install/npm.sh

@@ -0,0 +1,2 @@
+npm --prefix=bro-app-gateway i
+npm --prefix=bro-app-browser i