.ansible/deploy-draft.yml

@@ -1,26 +0,0 @@
----
-- 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:

.ansible/inventory

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

.drone.yml

@@ -39,33 +39,6 @@ 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
@@ -73,6 +46,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 402ef53d245969c2df4d6ec14d51d3d9665856c8fa0ec8248755a209fb66ff36
+hmac: 0f5318785e361ab48470f37a93f15cb218f6f2a22dbdd2ec2f16298dd7577ada
 
 ...

main.go

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