From a3675c0cc8e1209123cd251dcfe933a6da410a40 Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Wed, 18 Sep 2019 13:08:08 +0200
Subject: [PATCH] hackmd: new upstream URL and version 1.5.0

---
 roles/hackmd/defaults/main.yml        |  3 ++-
 roles/hackmd/tasks/main.yml           | 22 +++++++++++++++++++++-
 roles/hackmd/templates/config.json.j2 |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/roles/hackmd/defaults/main.yml b/roles/hackmd/defaults/main.yml
index 3abde1a..64445ac 100644
--- a/roles/hackmd/defaults/main.yml
+++ b/roles/hackmd/defaults/main.yml
@@ -1,3 +1,4 @@
 ---
 
-hackmd_version: 1.3.1
+hackmd_version: 1.5.0
+hackmd_archive: https://github.com/codimd/server/archive/{{ hackmd_version }}.tar.gz
diff --git a/roles/hackmd/tasks/main.yml b/roles/hackmd/tasks/main.yml
index afdb517..e912d0b 100644
--- a/roles/hackmd/tasks/main.yml
+++ b/roles/hackmd/tasks/main.yml
@@ -12,6 +12,21 @@
 - name: Enable nodesource repository
   apt_repository: repo="deb https://deb.nodesource.com/node_8.x/ {{ ansible_distribution_release }} main"
 
+- name: Enable yarnpkg apt-key
+  apt_key: url="https://dl.yarnpkg.com/debian/pubkey.gpg"
+
+- name: Enable yarnpkg repository
+  apt_repository: repo="deb https://dl.yarnpkg.com/debian/ stable main"
+
+- name: Pin nodejs repository
+  blockinfile:
+    path: /etc/apt/preferences.d/nodejs
+    create: yes
+    block: |
+      Package: *
+      Pin: origin deb.nodesource.com
+      Pin-Priority: 600
+
 - name: Install packages
   apt: name={{ item }}
   with_items:
@@ -20,11 +35,16 @@
   - nodejs
   - postgresql
   - python-psycopg2
+  - yarn
 
 - name: Unpack hackmd
-  unarchive: src=https://github.com/hackmdio/codimd/archive/{{ hackmd_version }}.tar.gz dest=/opt owner=hackmd group=hackmd remote_src=yes creates=/opt/codimd-{{ hackmd_version }}
+  unarchive: src={{ hackmd_archive }} dest=/opt owner=hackmd group=hackmd remote_src=yes creates=/opt/codimd-{{ hackmd_version }}
   register: hackmd_unarchive
 
+- name: Rename hackmd
+  command: mv /opt/server-{{ hackmd_version }} /opt/codimd-{{ hackmd_version }}
+  when: hackmd_unarchive.changed
+
 - name: Create hackmd upload path
   file: path=/opt/codimd/uploads state=directory recurse=yes owner=hackmd group=hackmd
 
diff --git a/roles/hackmd/templates/config.json.j2 b/roles/hackmd/templates/config.json.j2
index 3a42db1..36c459e 100644
--- a/roles/hackmd/templates/config.json.j2
+++ b/roles/hackmd/templates/config.json.j2
@@ -8,7 +8,7 @@
         "sessionSecret": "{{ hackmd_secret }}",
         "hsts": {
             "enable": true,
-            "maxAgeSeconds": "2592000",
+            "maxAgeSeconds": 2592000,
             "includeSubdomains": true,
             "preload": true
         },