On utilise la même version de zmarkdown que zds-site

- On utilise le package.json de zds-site
- On utilise la version de pm2 installée dans node_modules
- Le dossier de travail est /opt/zds/app/zmd et non plus /opt/zmd
- Quelques modifications cosmétiques

Author: Situphen

roles/zmd/defaults/main.yml

@@ -1,2 +1,2 @@
-zmarkdown_version: 9.1.3
 zmarkdown_sentry_dsn: ""
+zmarkdown_dir: "{{ appdir }}/zmd"

roles/zmd/handlers/main.yml

@@ -1,4 +1,4 @@
-- name: restart zmd
+- name: restart zmarkdown service
   systemd:
     name: zmd
     state: restarted

roles/zmd/tasks/main.yml

@@ -4,38 +4,13 @@
   tags:
     - bootstrap
 
-- name: install pm2 globally
-  npm:
-    name: pm2
-    global: yes
-  tags:
-    - bootstrap
-
-- name: create zmd home directory
-  file:
-    state: directory
-    path: /opt/zmd
-    owner: zds
-    group: zds
-    mode: 0755
-  tags:
-    - bootstrap
-
-- name: add server package.json
-  template:
-    src: package.json.j2
-    dest: /opt/zmd/package.json
-  register: zmd_package
-  notify: restart zmd
-  tags:
-    - bootstrap
-    - upgrade
-
 - name: install zmarkdown
+  become: true
+  become_user: zds
   npm:
-    name: zmarkdown
-    path: /opt/zmd
-  when: zmd_package.changed
+    path: "{{ zmarkdown_dir }}"
+    production: yes
+  notify: restart zmarkdown service
   tags:
     - bootstrap
     - upgrade
@@ -44,22 +19,22 @@
   template:
     src: zmd.service.j2
     dest: /etc/systemd/system/zmd.service
-  notify: restart zmd
+  notify: restart zmarkdown service
   tags:
     - bootstrap
     - upgrade
 
-- name: ensure zmd is running.
+- name: start zmarkdown service
   service:
     name: zmd
-    state: started
+    state: restarted
     enabled: yes
-  register: zmd_service
+    daemon_reload: true
   tags:
     - bootstrap
     - upgrade
 
-- name: check that zmd is running
+- name: check that zmarkdown is running
   uri:
     url: http://localhost:27272/
     return_content: yes

roles/zmd/templates/package.json.j2

@@ -11,14 +11,14 @@ LimitNOFILE=infinity
 LimitNPROC=infinity
 LimitCORE=infinity
 Environment=PATH=/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
-Environment=PM2_HOME=/opt/zmd/.pm2
+Environment=PM2_HOME={{ zmarkdown_dir }}/.pm2
 Environment=SENTRY_DSN={{ zmarkdown_sentry_dsn }}
 Environment=ZDS_ENVIRONMENT={{ env }}
-PIDFile=/opt/zmd/.pm2/pm2.pid
+PIDFile={{ zmarkdown_dir }}/.pm2/pm2.pid
 
-ExecStart=/usr/lib/node_modules/pm2/bin/pm2 start -f /opt/zmd/node_modules/zmarkdown/server/index.js -i 3 --max-memory-restart 150M
-ExecReload=/usr/lib/node_modules/pm2/bin/pm2 reload all
-ExecStop=/usr/lib/node_modules/pm2/bin/pm2 kill
+ExecStart={{ zmarkdown_dir }}/node_modules/pm2/bin/pm2 start -f {{ zmarkdown_dir }}/node_modules/zmarkdown/server/index.js -i 3 --max-memory-restart 150M
+ExecReload={{ zmarkdown_dir }}/node_modules/pm2/bin/pm2 reload all
+ExecStop={{ zmarkdown_dir }}/node_modules/pm2/bin/pm2 kill
 
 [Install]
 WantedBy=multi-user.target