chore(release): 2.0.1

Breaking change!

CHANGELOG.md

@@ -2,9 +2,26 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## 1.0.0 (2022-12-10)
+### [2.0.1](https://git.laurivan.com/Dev/ansible-role-outline-wiki/compare/v2.0.0...v2.0.1) (2022-12-11)
 
 
+### Bug Fixes
+
+* Fix template and rights. ([83d3e45](https://git.laurivan.com/Dev/ansible-role-outline-wiki/commit/83d3e45c05c096506430fd9e2568787c8a793a25))
+
+## [2.0.0](https://git.laurivan.com/Dev/ansible-role-outline-wiki/compare/v1.0.0...v2.0.0) (2022-12-10)
+
+
+### ⚠ BREAKING CHANGES
+
+* Make paths absolute.
+
+### Bug Fixes
+
+* Make paths absolute. ([310649b](https://git.laurivan.com/Dev/ansible-role-outline-wiki/commit/310649b9735822eee4f962bbb3f9207c33989f89))
+
+## 1.0.0 (2022-12-10)
+
 ### Bug Fixes
 
 * AWS variable, fake S3 condition. ([8b84af0](https://git.laurivan.com/Dev/ansible-role-outline-wiki/commit/8b84af081fc8ec7a63ce139409c3fbd546ae1478))

defaults/main.yml

@@ -7,7 +7,8 @@ outline_utils_secret: 'changeme'
 outline_deployment: ''
 
 outline_port: 3000
-outline_url: "http://localhost:{{ outline_port }}"
+outline_public_port: "{{ outline_port }}"
+outline_url: "http://localhost:{{ outline_public_port }}"
 outline_force_https: "false"
 outline_enable_updates: "false"
 outline_cdn_url: 

tasks/main.yml

@@ -21,11 +21,21 @@
     group: "{% if outline_gid %}{{ outline_gid }}{% else %}{{ ansible_effective_group_id }}{% endif %}"
     mode: "0750"
   with_items:
-    - "{{ outline_setup_path }}"
-    - "{{ outline_volume_redis }}"
-    - "{{ outline_volume_db }}"
-    - "{{ outline_volume_s3 }}"
+    - "{{ outline_setup_path | expanduser | realpath }}"
+    - "{{ outline_volume_redis | expanduser | realpath }}"
+    - "{{ outline_volume_s3 | expanduser | realpath }}"
+  tags:
+    - configuration
+  become: true
 
+- name: Set up the database directory.
+  ansible.builtin.file:
+    state: directory
+    path: "{{ item }}"
+    mode: "0755"
+    owner: 70
+  with_items:
+    - "{{ outline_volume_db | expanduser | realpath }}"
   tags:
     - configuration
   become: true
@@ -33,7 +43,7 @@
 - name: Write configuration files
   ansible.builtin.template:
     src: "{{ item }}.j2"
-    dest: "{{ outline_setup_path }}/{{ item }}"
+    dest: "{{ outline_setup_path | expanduser | realpath }}/{{ item }}"
     mode: '0640'
   loop:
     - "docker-compose.yml"
@@ -47,6 +57,6 @@
 
 - name: Ensure all requested components are running.
   community.docker.docker_compose:
-    project_src: "{{ outline_setup_path }}"
+    project_src: "{{ outline_setup_path | expanduser | realpath }}"
     build: false
   become: false

templates/docker-compose.yml.j2

@@ -13,7 +13,7 @@ services:
     networks:
       - outline
     volumes:
-      - {{ outline_volume_redis }}:/data
+      - {{ outline_volume_redis | expanduser | realpath }}:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
 
@@ -21,7 +21,7 @@ services:
   postgres:
     image: docker.io/library/postgres:12-alpine
     env_file:
-      - "{{ outline_setup_path }}/env.db.conf"
+      - "{{ outline_setup_path | expanduser | realpath }}/env.db.conf"
     restart: unless-stopped
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
@@ -45,24 +45,24 @@ services:
   s3:
     image: lphoward/fake-s3
     env_file:
-      - "{{ outline_setup_path }}/env.s3.conf"
+      - "{{ outline_setup_path | expanduser | realpath }}/env.s3.conf"
 {% if outline_fake_s3_port %}
     ports:
       - {{ outline_fake_s3_port }}:4569
 {% endif %}
     volumes:
-      - {{ outline_volume_s3 }}:/fakes3_root
+      - {{ outline_volume_s3 | expanduser | realpath }}:/fakes3_root
     networks:
       - outline
 {% endif %}
 
   outline:
     image: outlinewiki/outline:latest
-    command: sh -c "yarn start"
-    # command: sh -c "yarn sequelize:migrate --env production-ssl-disabled && yarn start"
+    #command: sh -c "yarn start"
+    command: sh -c "yarn sequelize:migrate --env production-ssl-disabled && yarn start"
     env_file:
-      - "{{ outline_setup_path }}/env.outline.conf"
-      - "{{ outline_setup_path }}/env.oidc.conf"
+      - "{{ outline_setup_path | expanduser | realpath }}/env.outline.conf"
+      - "{{ outline_setup_path | expanduser | realpath }}/env.oidc.conf"
     restart: always
     ports:
       - {{ outline_port }}:3000
@@ -79,4 +79,3 @@ services:
 
 networks:
   outline: {}
-     

templates/env.outline.conf.j2

@@ -8,13 +8,19 @@ UTILS_SECRET={{ outline_utils_secret }}
 
 DEPLOYMENT={{ outline_deployment }}
 
+{% if outline_db_schema == 'postgres' and outline_db_host == 'postgres' %}
+DATABASE_URL=postgres://{{ outline_db_user }}:{{ outline_db_password }}@postgres:5432/{{ outline_db }}
+{% else %}
 DATABASE_URL={{ outline_db_schema }}://{{ outline_db_user }}:{{ outline_db_password }}@{{outline_db_host}}:{{ outline_db_port }}/{{ outline_db }}
+{% endif %}
 DATABASE_URL_TEST={{ outline_db_schema }}://{{ outline_db_user }}:{{ outline_db_password }}@{{outline_db_host}}:{{ outline_db_port }}/{{ outline_db }}_test
 REDIS_URL=redis://redis:6379
 
 # Must point to the publicly accessible URL for the installation
 URL={{ outline_url }}
-PORT=3000
+{% if outline_public_port %}
+PORT={{ outline_public_port }}
+{% endif %}
 
 # Optional. If using a Cloudfront distribution or similar the origin server
 # should be set to the same as URL.
@@ -89,6 +95,3 @@ DEFAULT_LANGUAGE={{ outline_language }}
 {% if outline_db_ssl %}
 PGSSLMODE={{ outline_db_ssl }}
 {% endif %}
-
-
-