...
 
Commits (2)
{
"API": {
"BaseURL": "http://localhost:9991",
"PathPrefix": "v1/",
"Bind": ":9991",
"SwaggerAPIPath": "/apidocs.json",
"SwaggerPath": "/apidocs/",
"SwaggerFilePath": "/home/ubuntu/swagger-ui/dist",
"ImageFilePath": "/home/ubuntu/sangha_images"
},
"Connections": {
"PostgreSQLConnection": {
"Host": "sangha-postgres",
"DbName": "sangha",
"User": "sanghauser",
"Password": "sanghapass",
"Port": 5432,
"SslMode": "disable"
},
"AMQPConnection": {
"Host": "sangha-rabbitmq",
"User": "user",
"Password": "password",
"Port": 5672,
"Broker": "rabbit",
"Queue": "payments"
},
"PayPal": "http://localhost:9801"
},
"Web": {
"BaseURL": "http://localhost:4200/"
}
}
hosts: dns [!UNAVAIL=return] files
host sangha sanghauser 172.0.0.0/8 trust
version: "3" version: "2"
services: services:
sangha-postgres: sangha-postgres:
...@@ -7,6 +7,7 @@ services: ...@@ -7,6 +7,7 @@ services:
image: registry.gitlab.techcultivation.org/sangha/sangha-deployment/sangha-postgres:deployment image: registry.gitlab.techcultivation.org/sangha/sangha-deployment/sangha-postgres:deployment
volumes: volumes:
- ./database:/var/lib/postgresql - ./database:/var/lib/postgresql
- ./config/pg_hba.conf:/var/lib/postgresql/pg_hba.conf
working_dir: /var/lib/postgresql working_dir: /var/lib/postgresql
environment: environment:
PGDATA: /var/lib/postgresql PGDATA: /var/lib/postgresql
...@@ -15,7 +16,7 @@ services: ...@@ -15,7 +16,7 @@ services:
- "5432:5432" - "5432:5432"
# TODO # TODO
networks: networks:
- default - deploy
sangha-api: sangha-api:
container_name: sangha-api container_name: sangha-api
...@@ -29,7 +30,7 @@ services: ...@@ -29,7 +30,7 @@ services:
command: /bin/sangha serve command: /bin/sangha serve
# TODO # TODO
networks: networks:
- default - deploy
sangha-rabbitmq: sangha-rabbitmq:
container_name: sangha-rabbitmq container_name: sangha-rabbitmq
...@@ -40,9 +41,8 @@ services: ...@@ -40,9 +41,8 @@ services:
ports: ports:
- "5672:5672" - "5672:5672"
networks: networks:
- default - deploy
networks: networks:
default: deploy:
driver: bridge
\ No newline at end of file
...@@ -71,7 +71,11 @@ let ...@@ -71,7 +71,11 @@ let
# make localhost resolvable # make localhost resolvable
echo "127.0.0.1 localhost" > /etc/hosts echo "127.0.0.1 localhost" > /etc/hosts
echo "hosts: files" > /etc/nsswitch.conf # enable hosts file (`files`) and dns resolution (`dns`)
# TODO: might make sense to make this more generic
# libnss_dns.so, libnss_files.sh … provide these
# (TODO where do they come from?)
echo "hosts: files dns" > /etc/nsswitch.conf
'' ''
+ rootSetupScript; + rootSetupScript;
......