Skip to content

Commit

Permalink
Update deployment
Browse files Browse the repository at this point in the history
  • Loading branch information
santteegt committed Jul 21, 2020
1 parent de7eebb commit 82adf14
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 80 deletions.
77 changes: 0 additions & 77 deletions docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,83 +1,6 @@
version: '3.4'

x-database-credentials: &database-credentials
DB_HOST: "db"
DB_PORT: "5432"
DB_USER: "${DB_USER:-admin}"
DB_PASSWORD: "${DB_PASSWORD}"
DB_LOGIN_DB: "${DB_LOGIN_DB:-rasa}"

x-rabbitmq-credentials: &rabbitmq-credentials
RABBITMQ_HOST: "rabbit"
RABBITMQ_USERNAME: "user"
RABBITMQ_PASSWORD: ${RABBITMQ_PASSWORD}

x-redis-credentials: &redis-credentials
REDIS_HOST: "redis"
REDIS_PORT: "6379"
REDIS_PASSWORD: ${REDIS_PASSWORD}
REDIS_DB: "1"

x-duckling-credentials: &duckling-credentials
RASA_DUCKLING_HTTP_URL: "http://duckling:8000"

x-rasax-credentials: &rasax-credentials
RASA_X_HOST: "http://rasa-x:5002"
RASA_X_USERNAME: ${RASA_X_USERNAME:-admin}
RASA_X_PASSWORD: ${RASA_X_PASSWORD:-}
RASA_X_TOKEN: ${RASA_X_TOKEN}
JWT_SECRET: ${JWT_SECRET}
RASA_USER_APP: "http://app:5055"
RASA_PRODUCTION_HOST: "http://rasa-production:5005"
RASA_WORKER_HOST: "http://rasa-worker:5005"
RASA_TOKEN: ${RASA_TOKEN}

x-rasa-credentials: &rasa-credentials
<<: *rabbitmq-credentials
<<: *rasax-credentials
<<: *database-credentials
<<: *redis-credentials
<<: *duckling-credentials
RASA_TOKEN: ${RASA_TOKEN}
RASA_MODEL_PULL_INTERVAL: 10
RABBITMQ_QUEUE: "rasa_production_events"

x-rasa-services: &default-rasa-service
restart: always
image: "rasa/rasa:${RASA_VERSION}-full"
expose:
- "5005"
command: >
x
--no-prompt
--production
--config-endpoint http://rasa-x:5002/api/config?token=${RASA_X_TOKEN}
--port 5005
--jwt-method HS256
--jwt-secret ${JWT_SECRET}
--auth-token '${RASA_TOKEN}'
--cors "*"
--credentials /app/credentials.yml
--endpoints /app/endpoints.yml
depends_on:
- rasa-x
- rabbit
- redis

services:
rasa-production:
<<: *default-rasa-service
ports:
- "5005:5005"
volumes:
- ./environments.yml:/app/environments.yml
- ./credentials.yml:/app/credentials.yml
environment:
<<: *rasa-credentials
RASA_ENVIRONMENT: "production"
DB_DATABASE: "tracker"
RASA_MODEL_SERVER: "http://rasa-x:5002/api/projects/default/models/tags/production"

app:
image: 'santteegt/glpi-chatbot-actions:latest'
expose:
Expand Down
9 changes: 6 additions & 3 deletions domain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,11 @@ responses:
- text: Tu respuesta no es muy clara. Puedes escribir "ayuda" para mayor asistencia.
utter_greet:
- text: Hola! Bienvenido al Sistema de Helpdesk de la Universidad de Cuenca.
- text: Bienvenido al Sistema Helpdesk de la U de Cuenca (TESTNET)
channel: "rasa"
- text: Hola! Bienvenido al Sistema de Helpdesk de la Universidad de Cuenca.
¿Tal vez le puedo ayudar a resolver uno de estos requerimientos?
channel: socketio
- text: Bienvenido al Sistema Helpdesk de la U de Cuenca (TEST)
channel: rasa
utter_goodbye:
- text: Hasta luego! Gracias por utilizar el servicio
- text: Gracias por utilizar el servicio. Adiós!
Expand Down Expand Up @@ -321,7 +324,7 @@ responses:
type: "postback" # web_url
url: ""
channel: socketio
- text: Tal vez te interesan resolver uno de estos procesos?
- text: Tal vez le interesa resolver uno de estos requerimientos?
Tambien puede darme una descripción del problema que necesita resolver.
buttons:
- title: Conexión a la red WIFI
Expand Down

0 comments on commit 82adf14

Please sign in to comment.