moved app source to dedicated dir /app/ to seperate home dir from app dir preventing git conflicts; fixed loading modules as etherpad user

This commit is contained in:
muppeth 2022-06-20 02:27:16 +02:00
parent c53c0787c2
commit 7c3effae6a
Signed by: muppeth
GPG key ID: 0EBC7B9848D04031
6 changed files with 12 additions and 8 deletions

2
Vagrantfile vendored
View file

@ -8,7 +8,7 @@
Vagrant.configure("2") do |config|
#config.ssh.insert_key = false
config.vm.define "etherpad" do |etherpad|
etherpad.vm.box = "generic/debian10"
etherpad.vm.box = "generic/debian11"
etherpad.vm.provider :libvirt do |libvirt|
libvirt.memory = 256
end

View file

@ -1,6 +1,6 @@
---
etherpad_version: '1.8.17'
etherpad_version: '1.8.18'
etherpad_skin: 'colibris'
etherpad_skinVariants: 'super-light-toolbar super-light-editor light-background'
etherpad_username: 'etherpad'

View file

@ -11,7 +11,7 @@
- name: '[CONFIGURE] - Deploy config'
template:
src: var/www/etherpad-lite/settings.json.j2
dest: "{{ etherpad_app_dir }}/settings.json"
dest: "{{ etherpad_app_dir }}/app/settings.json"
owner: "{{ etherpad_username }}"
group: "{{ etherpad_group }}"
mode: 0644

View file

@ -3,7 +3,7 @@
- name: '[GIT] - Deploy source'
git:
repo: https://github.com/ether/etherpad-lite.git
dest: "{{ etherpad_app_dir }}"
dest: "{{ etherpad_app_dir }}/app"
force: yes
update: yes
version: "{{ etherpad_version }}"

View file

@ -3,9 +3,11 @@
- name: '[Modules] - Install modules'
npm:
name: "{{ item.name }}"
path: "{{ etherpad_app_dir }}"
path: "{{ etherpad_app_dir }}/app"
state: latest
with_items: "{{ etherpad_plugins }}"
become: yes
become_user: "{{ etherpad_username }}"
when: item.install|lower == 'true'
notify:
restart etherpad
@ -13,9 +15,11 @@
- name: '[Modules] - Uninstall modules'
npm:
name: "{{ item.name }}"
path: "{{ etherpad_app_dir }}"
path: "{{ etherpad_app_dir }}/app"
state: absent
with_items: "{{ etherpad_plugins }}"
become: yes
become_user: "{{ etherpad_username }}"
when: item.install|lower == 'false'
notify:
restart etherpad

View file

@ -6,9 +6,9 @@ After=syslog.target network.target
Type=simple
User={{ etherpad_username }}
Group={{ etherpad_group }}
WorkingDirectory={{ etherpad_app_dir }}
WorkingDirectory={{ etherpad_app_dir }}/app
Environment=NODE_ENV=production
ExecStart={{ etherpad_app_dir }}/bin/run.sh
ExecStart={{ etherpad_app_dir }}/app/bin/run.sh
StandardOutput=file:{{ etherpad_logfile }}
Restart=always
RestartSec=3