remove bower and other things needed for 5.4.1 (#21)

@muppeth I've updated host_vars, nginx template and cryptpad role to match https://github.com/cryptpad/cryptpad/releases/tag/5.4.0 BUT, for some reason, it doesn't work. I can go on cryptpad, but can not launch any app as I'm stocked on "loading drive". Cryptpad checkup gives me `Unable to connect to the websocket server` but I don't understand why as I set it on proxy and on cryptpad CT. I'm getting mad with that, so I'm stopping now! If you can have a quick look, perhaps you'll find what's up (my guess is how I set host_vars for proxy CT, but I'm not sure).

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #21
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
This commit is contained in:
meaz 2023-09-06 19:26:19 +00:00
parent ca907c6344
commit d8e31c1eb4
6 changed files with 48 additions and 34 deletions

View File

@ -10,7 +10,7 @@ cryptpad_pkg:
cryptpad_node_version: '16'
cryptpad_path: '/var/www/cryptpad'
cryptpad_version: "5.3.0"
cryptpad_version: "5.4.1"
# Config.js
cryptpad_httpUnsafeOrigin: "https://cryptpad.example.org"
@ -18,6 +18,7 @@ cryptpad_httpSafeOrigin: ''
cryptpad_httpAddress: "::"
cryptpad_httpPort: "3000"
cryptpad_httpSafePort: "3001"
cryptpad_websocketPort: "3003"
cryptpad_maxWorkers: "4"
cryptpad_adminKeys:
- "[cryptpad-user1@my.awesome.website/eglegkejfizu#otoUFng55s64Are856URjvAHGGv-89=]"
@ -77,5 +78,4 @@ nginx_vhosts:
letsencrypt: 'false'
selfsigned: 'true'
ssl_name: 'cryptpad.example.org'
proxy_pass: 'localhost'
debug: 'false'
proxy_pass: 'localhost'

View File

@ -5,7 +5,7 @@
cmd: awk '/cryptpad/{getline; print $2}' {{ cryptpad_path }}/package-lock.json | awk -F\" '{print $2}'
register: cryptpad_version_installed
- name: "[Check] - Bower folder exists"
- name: "[Check] - Bower folder exists" # Needs to be changed as bower is removed now...
stat:
path: "{{ cryptpad_path }}/www/bower_components"
register: bower_folder

View File

@ -1,15 +1,19 @@
---
- name: "[Install] - Cryptpad via npm"
npm:
path: "{{ cryptpad_path }}"
- name: "[Update] - Download all dependencies"
shell:
cmd: "npm install"
args:
chdir: "{{ cryptpad_path }}"
become: yes
become_user: "{{ cryptpad_user }}"
notify: restart cryptpad
- name: "[Install] - Cryptpad dependencies via bower"
bower:
path: "{{ cryptpad_path }}"
- name: "[Update] - Copy client-side dependencies"
shell:
cmd: "npm run install:components"
args:
chdir: "{{ cryptpad_path }}"
become: yes
become_user: "{{ cryptpad_user }}"
register: result
retries: 3
delay: 15
until: result is not failed
notify: restart cryptpad

View File

@ -15,9 +15,3 @@
name: "{{ cryptpad_pkg }}"
update_cache: yes
state: latest
- name: "[Dependencies] - Install bower"
npm:
name: bower
global: yes
state: latest

View File

@ -5,22 +5,25 @@
name: cryptpad
state: stopped
- name: "[Update] - npm"
npm:
name: npm
global: yes
state: latest
- name: "[Update] - bower"
bower:
state: latest
path: "{{ cryptpad_path }}"
register: result
retries: 3
delay: 15
until: result is not failed
- name: "[Update] - Download all dependencies"
shell:
cmd: "npm install"
args:
chdir: "{{ cryptpad_path }}"
become: yes
become_user: "{{ cryptpad_user }}"
notify: restart cryptpad
- name: "[Update] - Copy client-side dependencies"
shell:
cmd: "npm run install:components"
args:
chdir: "{{ cryptpad_path }}"
become: yes
become_user: "{{ cryptpad_user }}"
notify: restart cryptpad
- name: "[Update] - Generate static pages"
shell:
cmd: "npm run build"

View File

@ -92,6 +92,19 @@ module.exports = {
*/
httpSafePort: {{ cryptpad_httpSafePort }},
/* Websockets need to be exposed on a separate port from the rest of
* the platform's HTTP traffic. Port 3003 is used by default.
* You can change this to a different port if it is in use by a
* different service, but under most circumstances you can leave this
* commented and it will work.
*
* In production environments, your reverse proxy (usually NGINX)
* will need to forward websocket traffic (/cryptpad_websocket)
* to this port.
*
*/
websocketPort: {{ cryptpad_websocketPort }},
/* CryptPad will launch a child process for every core available
* in order to perform CPU-intensive tasks in parallel.
* Some host environments may have a very large number of cores available