Merge pull request 'moved app source to dedicated dir /app/ to seperate home dir from app dir preventing git conflicts; fixed loading modules as etherpad user' (#7) from 1.8.18 into master
Reviewed-on: #7 Reviewed-by: meaz <meaz@no-reply@disroot.org>
This commit is contained in:
commit
f0de627f05
|
@ -8,7 +8,7 @@
|
||||||
Vagrant.configure("2") do |config|
|
Vagrant.configure("2") do |config|
|
||||||
#config.ssh.insert_key = false
|
#config.ssh.insert_key = false
|
||||||
config.vm.define "etherpad" do |etherpad|
|
config.vm.define "etherpad" do |etherpad|
|
||||||
etherpad.vm.box = "generic/debian10"
|
etherpad.vm.box = "generic/debian11"
|
||||||
etherpad.vm.provider :libvirt do |libvirt|
|
etherpad.vm.provider :libvirt do |libvirt|
|
||||||
libvirt.memory = 256
|
libvirt.memory = 256
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
|
|
||||||
etherpad_version: '1.8.17'
|
etherpad_version: '1.8.18'
|
||||||
etherpad_skin: 'colibris'
|
etherpad_skin: 'colibris'
|
||||||
etherpad_skinVariants: 'super-light-toolbar super-light-editor light-background'
|
etherpad_skinVariants: 'super-light-toolbar super-light-editor light-background'
|
||||||
etherpad_username: 'etherpad'
|
etherpad_username: 'etherpad'
|
||||||
|
@ -74,7 +74,7 @@ etherpad_plugins:
|
||||||
- name: ep_real_time_chat
|
- name: ep_real_time_chat
|
||||||
install: true
|
install: true
|
||||||
- name: ep_delete_after_delay
|
- name: ep_delete_after_delay
|
||||||
install: false
|
install: true
|
||||||
- name: ep_align
|
- name: ep_align
|
||||||
install: true
|
install: true
|
||||||
- name: ep_font_size
|
- name: ep_font_size
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
- name: '[CONFIGURE] - Deploy config'
|
- name: '[CONFIGURE] - Deploy config'
|
||||||
template:
|
template:
|
||||||
src: var/www/etherpad-lite/settings.json.j2
|
src: var/www/etherpad-lite/settings.json.j2
|
||||||
dest: "{{ etherpad_app_dir }}/settings.json"
|
dest: "{{ etherpad_app_dir }}/app/settings.json"
|
||||||
owner: "{{ etherpad_username }}"
|
owner: "{{ etherpad_username }}"
|
||||||
group: "{{ etherpad_group }}"
|
group: "{{ etherpad_group }}"
|
||||||
mode: 0644
|
mode: 0644
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
- name: '[GIT] - Deploy source'
|
- name: '[GIT] - Deploy source'
|
||||||
git:
|
git:
|
||||||
repo: https://github.com/ether/etherpad-lite.git
|
repo: https://github.com/ether/etherpad-lite.git
|
||||||
dest: "{{ etherpad_app_dir }}"
|
dest: "{{ etherpad_app_dir }}/app"
|
||||||
force: yes
|
force: yes
|
||||||
update: yes
|
update: yes
|
||||||
version: "{{ etherpad_version }}"
|
version: "{{ etherpad_version }}"
|
||||||
|
|
|
@ -3,9 +3,11 @@
|
||||||
- name: '[Modules] - Install modules'
|
- name: '[Modules] - Install modules'
|
||||||
npm:
|
npm:
|
||||||
name: "{{ item.name }}"
|
name: "{{ item.name }}"
|
||||||
path: "{{ etherpad_app_dir }}"
|
path: "{{ etherpad_app_dir }}/app"
|
||||||
state: latest
|
state: latest
|
||||||
with_items: "{{ etherpad_plugins }}"
|
with_items: "{{ etherpad_plugins }}"
|
||||||
|
become: yes
|
||||||
|
become_user: "{{ etherpad_username }}"
|
||||||
when: item.install|lower == 'true'
|
when: item.install|lower == 'true'
|
||||||
notify:
|
notify:
|
||||||
restart etherpad
|
restart etherpad
|
||||||
|
@ -13,9 +15,11 @@
|
||||||
- name: '[Modules] - Uninstall modules'
|
- name: '[Modules] - Uninstall modules'
|
||||||
npm:
|
npm:
|
||||||
name: "{{ item.name }}"
|
name: "{{ item.name }}"
|
||||||
path: "{{ etherpad_app_dir }}"
|
path: "{{ etherpad_app_dir }}/app"
|
||||||
state: absent
|
state: absent
|
||||||
with_items: "{{ etherpad_plugins }}"
|
with_items: "{{ etherpad_plugins }}"
|
||||||
|
become: yes
|
||||||
|
become_user: "{{ etherpad_username }}"
|
||||||
when: item.install|lower == 'false'
|
when: item.install|lower == 'false'
|
||||||
notify:
|
notify:
|
||||||
restart etherpad
|
restart etherpad
|
||||||
|
|
|
@ -6,9 +6,9 @@ After=syslog.target network.target
|
||||||
Type=simple
|
Type=simple
|
||||||
User={{ etherpad_username }}
|
User={{ etherpad_username }}
|
||||||
Group={{ etherpad_group }}
|
Group={{ etherpad_group }}
|
||||||
WorkingDirectory={{ etherpad_app_dir }}
|
WorkingDirectory={{ etherpad_app_dir }}/app
|
||||||
Environment=NODE_ENV=production
|
Environment=NODE_ENV=production
|
||||||
ExecStart={{ etherpad_app_dir }}/bin/run.sh
|
ExecStart={{ etherpad_app_dir }}/app/bin/run.sh
|
||||||
StandardOutput=file:{{ etherpad_logfile }}
|
StandardOutput=file:{{ etherpad_logfile }}
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=3
|
RestartSec=3
|
||||||
|
|
Loading…
Reference in New Issue