Skip to content

Commit

Permalink
remove rocketchat integration
Browse files Browse the repository at this point in the history
  • Loading branch information
gabriel-v committed Apr 9, 2024
1 parent 37fabed commit d317a8a
Show file tree
Hide file tree
Showing 24 changed files with 42 additions and 631 deletions.
31 changes: 28 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,37 @@
## Unreleased

### Upgrade Notes
- Follow ["clean reset" procedure](https://github.com/liquidinvestigations/docs/wiki/Maintenance#clean-reset) with **[cluster version 0.18.1](https://github.com/liquidinvestigations/cluster/tree/v0.18.1)**
- Follow ["clean reset" procedure](https://github.com/liquidinvestigations/docs/wiki/Maintenance#clean-reset) with **[cluster version 0.18.2](https://github.com/liquidinvestigations/cluster/tree/v0.18.2)**

### Breaking Changes and Deprecation Notice

- Removed the "rocketchat" integration. Desired chat logs should be exported
manually from the application prior to upgrading.
- Deprecating the old "nextcloud" integration, it is superseded by
"nextcloud28". Details below. Please export any Nextcloud-related data; this
integration will be removed next release.
- Hoover UI: Removed the "print view" button on documents, as it malfunctioned,
feature is to be reworked in the future.


### New Features

- Nextcloud v28:
- Integrated latest version of Nextcloud software.
- Access Control: All Nextcloud v28 user & access control settings are available.
- Integrated Collabora real-time office solution with Nextcloud.
- Hoover Web Integration: Individual Nextcloud folders can now be imported into Hoover from the web page admin. Functionality can be enabled by generating a Nextcloud "app password" / "api key" and pasting it in the Hoover admin for your own user.


### Bug Fixes

- Fixed issue where Grist sandbox would not work on RHEL-based distros
- Fixed issue where Prophecies permission checkbox would not appear in home page admin site
- Hoover UI:
- Fixed bug where some PDF documents would fail to load.
- Fixed display errors in the "table view" of search results.
- Grist integration: Fixed issue where Grist sandbox would not work on some
systems.
- Prophecies integration: Fixed issue where Prophecies permission checkbox
would not appear in home page admin site.


## v0.28.2 (2024-03-12)
Expand Down
1 change: 0 additions & 1 deletion ci/conf/1-no-collections.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ acme_caServer = https://acme-staging-v02.api.letsencrypt.org/directory

[apps]
default_app_status = on
rocketchat = off

[snoop]
enable_workers = false
Expand Down
1 change: 0 additions & 1 deletion ci/conf/1-with-collections-stopped.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ acme_caServer = https://acme-staging-v02.api.letsencrypt.org/directory

[apps]
default_app_status = on
rocketchat = off

[snoop]
enable_workers = false
Expand Down
1 change: 0 additions & 1 deletion ci/conf/1-with-collections.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ acme_caServer = https://acme-staging-v02.api.letsencrypt.org/directory

[apps]
default_app_status = on
rocketchat = off

[snoop]
enable_workers = true
Expand Down
2 changes: 0 additions & 2 deletions default-versions.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ liquid-nextcloud28 = liquidinvestigations/liquid-nextcloud:nextcloud-28
pause = liquidinvestigations/pause:2015
pdf-preview = thecodingmachine/gotenberg:7.4.3
pgpool = bitnami/pgpool:4.3.3
rocketchat = rocketchat/rocket.chat:3.18.5
rocketchat-mongo = mongo:4.4
thumbnail-generator = liquidinvestigations/preview-service:0.4.0-liquid-2
pgwatch2 = liquidinvestigations/pgwatch2:postgres-30-08-2023
fabio = fabiolb/fabio:1.6.3
Expand Down
93 changes: 0 additions & 93 deletions docs/RocketChat.md

This file was deleted.

20 changes: 2 additions & 18 deletions examples/liquid.ini
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ mount_local_repos = false
auth_staff_only = false

# Automatically kill all login sessions after this time.
# Does not work for RocketChat, configure that with the "rocketchat_autologout_days" setting below.
# Defaults to 100 days.
;auth_auto_logout = 12h

Expand Down Expand Up @@ -149,22 +148,6 @@ two_factor_auth = false
;hoover_ui_async_search_error_multiplier = 2
;hoover_ui_async_search_error_summation = 60

# Removes the Rocket.Chat login form, only leaving the button. Set this after
# the OAuth manual step is done.
;rocketchat_show_login_form = false

# Uncomment this line to enable Rocketchat Push notifications. Default is `false`.
# This uses the public RocketChat Gateway and their integrations with Apple and Google.
# After enabling the flag you need to create a free RocketChat Cloud account
# and add a Self-Hosted Registration Token to the Connection Services tab from
# RocketChat Admin.
;rocketchat_enable_push = true

# Set number of days after which the RocketChat client requires a re-login.
# RocketChat is not affected by the "auth_auto_logout" setting above.
# Default is 100. Recommended for mobile app usage: 5-30 days.
;rocketchat_autologout_days = 6


# Set the initial admin email of the Grist installation.
;grist_initial_admin = [email protected]
Expand Down Expand Up @@ -205,9 +188,10 @@ two_factor_auth = false
;hoover = on
;nextcloud = on
;dokuwiki = on
;rocketchat = on
;codimd = on
;wikijs = on
;nextcloud28 = on
;matrix = on

# These apps must be explicitly turned on, as they ignore the `default_app_status` configured above.
;grist = on
Expand Down
1 change: 0 additions & 1 deletion examples/production-example-security-options.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,4 @@ auth_auto_logout = 12h
http_port = 80
debug = false
mount_local_repos = false
rocketchat_show_login_form = false
version_track = production
22 changes: 0 additions & 22 deletions examples/small-mem-8gb-readonly-options.ini
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@ mount_local_repos = true
# Allow only staff to log in (e.g. during maintenance)
auth_staff_only = false

# Automatically kill all login sessions after this time.
# Does not work for RocketChat, configure that with the "rocketchat_autologout_days" setting below.
# Defaults to 100 days.
;auth_auto_logout = 12h

# Two-factor authentication
two_factor_auth = false

Expand Down Expand Up @@ -147,22 +142,6 @@ hoover_ui_disable_build = on
;hoover_ui_async_search_error_multiplier = 2
;hoover_ui_async_search_error_summation = 60

# Removes the Rocket.Chat login form, only leaving the button. Set this after
# the OAuth manual step is done.
;rocketchat_show_login_form = false

# Uncomment this line to enable Rocketchat Push notifications. Default is `false`.
# This uses the public RocketChat Gateway and their integrations with Apple and Google.
# After enabling the flag you need to create a free RocketChat Cloud account
# and add a Self-Hosted Registration Token to the Connection Services tab from
# RocketChat Admin.
;rocketchat_enable_push = true

# Set number of days after which the RocketChat client requires a re-login.
# RocketChat is not affected by the "auth_auto_logout" setting above.
# Default is 100. Recommended for mobile app usage: 5-30 days.
;rocketchat_autologout_days = 6

# Version set to track for running `./liquid-update`.
# Possible values:
# - production (default) - tracking fixed versions for every service
Expand Down Expand Up @@ -199,7 +178,6 @@ monitoring_enabled = off
hoover = on
;nextcloud = on
;dokuwiki = on
;rocketchat = on
;codimd = on
;wikijs = on

Expand Down
18 changes: 3 additions & 15 deletions liquid_node/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from .util import import_string
# from .docker import docker
from liquid_node.jobs import Job, liquid, hoover, dokuwiki, rocketchat, \
from liquid_node.jobs import Job, liquid, hoover, dokuwiki, \
nextcloud, codimd, ci, wikijs, matrix, grist, prophecies, nextcloud28

log = logging.getLogger(__name__)
Expand Down Expand Up @@ -51,14 +51,13 @@ def check_unused_values(self):


class Configuration:
ALL_APPS = ('hoover', 'dokuwiki', 'wikijs', 'rocketchat', 'nextcloud',
ALL_APPS = ('hoover', 'dokuwiki', 'wikijs', 'nextcloud',
'codimd', 'matrix', 'grist', 'prophecies', 'nextcloud28')
# The core apps can't be turned off.
CORE_APPS = ('liquid', 'ingress',)

APP_TITLE = {
'dokuwiki': 'DokuWiki',
'rocketchat': "Rocket.Chat",
'codimd': "CodiMD",
'wikijs': "Wiki.js",
}
Expand All @@ -69,7 +68,6 @@ class Configuration:
'wikijs': 'is a new wiki system with modern functionality.',
'codimd': 'is a real-time collaboration pad.',
'nextcloud': 'has a file share system and a contact list of users.',
'rocketchat': 'is the old chat app; will remove shortly.',
'matrix': 'is the new chat app',
'grist': 'is a collaborative spreadsheet / worksheet web app.',
'prophecies': 'the app to conduct collaborative data validation and cleaning.',
Expand All @@ -82,7 +80,7 @@ class Configuration:
'codimd': 3,
'nextcloud': 4,
'nextcloud28': 5,
'collabora': 7
'collabora': 7,
'grist': 11,
'prophecies': 12,
}
Expand Down Expand Up @@ -113,9 +111,6 @@ class Configuration:
hoover.Migrate(),
dokuwiki.Dokuwiki(),
dokuwiki.Proxy(),
rocketchat.Rocketchat(),
rocketchat.Deps(),
rocketchat.Migrate(),
nextcloud.Nextcloud(),
nextcloud.Deps(),
nextcloud.Proxy(),
Expand Down Expand Up @@ -247,9 +242,6 @@ def __init__(self):
'hoover_web_memory_limit', fallback=600)
self.hoover_web_count = self.ini.getint('liquid',
'hoover_web_count', fallback=1)
self.rocketchat_show_login_form = self.ini.getboolean('liquid', 'rocketchat_show_login_form', fallback=True) # noqa: E501
self.rocketchat_enable_push = self.ini.getboolean('liquid', 'rocketchat_enable_push', fallback=False) # noqa: E501
self.rocketchat_autologout_days = self.ini.getint('liquid', 'rocketchat_autologout_days', fallback=100) # noqa: E501
# remove spaces from the comma separated list
self.matrix_federation_domains = ','.join([
x.strip()
Expand Down Expand Up @@ -429,7 +421,6 @@ def __init__(self):
'search_pg': self.ini.getint('ports', 'search_pg', fallback=9983),
'snoop_rabbitmq': self.ini.getint('ports', 'snoop_rabbitmq', fallback=9984),
'search_rabbitmq': self.ini.getint('ports', 'search_rabbitmq', fallback=9985),
'rocketchat_mongo': self.ini.getint('ports', 'rocketchat_mongo', fallback=9986),
'nextcloud_maria': self.ini.getint('ports', 'nextcloud_maria', fallback=9987),
'nextcloud28_maria': self.ini.getint('ports', 'nextcloud28_maria', fallback=9969),
'codimd_pg': self.ini.getint('ports', 'codimd_pg', fallback=9988),
Expand All @@ -439,7 +430,6 @@ def __init__(self):
'collabora': self.ini.getint('ports', 'collabora', fallback=9948),
'hoover': self.ini.getint('ports', 'hoover', fallback=9994),
'dokuwiki': self.ini.getint('ports', 'dokuwiki', fallback=9995),
'rocketchat': self.ini.getint('ports', 'rocketchat', fallback=9980),
'hoover_es_master_transport': self.ini.getint(
'ports', 'hoover_es_master_transport', fallback=9979,),
'wikijs_pg': self.ini.getint('ports', 'wikijs-pg', fallback=9974),
Expand Down Expand Up @@ -474,7 +464,6 @@ def __init__(self):
self.port_search_pg = self.PORT_MAP['search_pg']
self.port_snoop_rabbitmq = self.PORT_MAP['snoop_rabbitmq']
self.port_search_rabbitmq = self.PORT_MAP['search_rabbitmq']
self.port_rocketchat_mongo = self.PORT_MAP['rocketchat_mongo']
self.port_nextcloud_maria = self.PORT_MAP['nextcloud_maria']
self.port_nextcloud28_maria = self.PORT_MAP['nextcloud28_maria']
self.port_codimd_pg = self.PORT_MAP['codimd_pg']
Expand All @@ -484,7 +473,6 @@ def __init__(self):
self.port_collabora = self.PORT_MAP['collabora']
self.port_hoover = self.PORT_MAP['hoover']
self.port_dokuwiki = self.PORT_MAP['dokuwiki']
self.port_rocketchat = self.PORT_MAP['rocketchat']
self.port_hoover_es_master_transport = self.PORT_MAP['hoover_es_master_transport']
self.port_wikijs_pg = self.PORT_MAP['wikijs_pg']
self.port_wikijs = self.PORT_MAP['wikijs']
Expand Down
39 changes: 0 additions & 39 deletions liquid_node/jobs/rocketchat.py

This file was deleted.

Loading

0 comments on commit d317a8a

Please sign in to comment.