Compare commits

...

4 Commits

Author SHA1 Message Date
b58fe592c5 fix ansible
Some checks reported errors
continuous-integration/drone/push Build was killed
2019-09-28 11:55:14 +02:00
6ae88a3c79 Ansible + fix default path 2019-09-28 11:55:00 +02:00
2c3f807c09 Build docker branch 2019-09-28 11:55:00 +02:00
567dc58d9b MAJ vue.js 2019-09-28 11:54:14 +02:00
6 changed files with 11444 additions and 9500 deletions

26
.ansible/deploy-draft.yml Normal file
View File

@ -0,0 +1,26 @@
---
- hosts: docker
tasks:
- name: deploy draft
docker_container:
name: "bouquins_draft_{{ draft_name }}"
image: "reg.meutel.net/go-bouquins:{{ draft_name }}"
state: started
recreate: yes
labels:
traefik.enable: 'true'
traefik.port: '9000'
traefik.docker.network: 'proxybackend'
traefik.frontend.rule: "Host:{{ draft_name }}.bouquins.www.meutel.net"
traefik.frontend.entryPoints: http
networks:
- name: proxybackend
purge_networks: yes
volumes:
- bouquins_draft:/root/data
register: deploy_out
- debug:
msg: "{{ deploy_out.container }}"
# vim:ft=ansible:

4
.ansible/inventory Normal file
View File

@ -0,0 +1,4 @@
ambrosia ansible_host=148.251.42.122 ansible_python_interpreter=/usr/bin/python3 ansible_user=drone
[docker]
ambrosia

View File

@ -39,6 +39,33 @@ steps:
event:
- tag
- name: docker-branch
image: plugins/docker
settings:
registry: reg.meutel.net
repo: reg.meutel.net/go-bouquins
tags: ${DRONE_BRANCH##feature/}
username:
from_secret: registry_login
password:
from_secret: registry_password
when:
branch:
- feature/*
- name: deploy-branch
image: plugins/ansible:1
settings:
playbook: .ansible/deploy-draft.yml
inventory: .ansible/inventory
private_key:
from_secret: drone_ssh_key
extra_vars:
- draft_name=${DRONE_BRANCH##feature/}
when:
branch:
- feature/*
trigger:
event:
- push
@ -46,6 +73,6 @@ trigger:
---
kind: signature
hmac: 0f5318785e361ab48470f37a93f15cb218f6f2a22dbdd2ec2f16298dd7577ada
hmac: 402ef53d245969c2df4d6ec14d51d3d9665856c8fa0ec8248755a209fb66ff36
...

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -32,13 +32,13 @@ func ReadConfig() (*bouquins.Conf, error) {
}
// default values
if conf.CalibrePath == "" {
conf.CalibrePath = "."
conf.CalibrePath = "./data"
}
if conf.DbPath == "" {
conf.DbPath = conf.CalibrePath + "/metadata.db"
}
if conf.UserDbPath == "" {
conf.UserDbPath = "./users.db"
conf.UserDbPath = "./data/users.db"
}
if conf.BindAddress == "" {
conf.BindAddress = ":9000"