Skip to content

Commit c262de4

Browse files
szaimenszaimen
authored
Preparations for the next NC22.0.0 NcVM release (#1997)
1 parent 89e77e3 commit c262de4

File tree

8 files changed

+121
-436
lines changed

8 files changed

+121
-436
lines changed

‎CHANGELOG.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,46 @@ If you run Hyper-V or want 500 GB, 1 TB or 2 TB VM you can download it from [T&M
1515

1616
PR's are more than welcome. Happy Nextclouding!
1717

18+
## 22.0.0
19+
20+
### Small changelog:
21+
- Add SMTP2GO to SMTP-Relay
22+
- Remove APCu and replace with Redis instead
23+
- Made it possible to add subdomains to deSEC
24+
- Improved spinner_loading
25+
- Added dates to automatic updates log
26+
- Added regular ZFS snapshot prune
27+
- Added retention for Nextclouds user activities
28+
- Previewgenerator - allow to clear all previews
29+
- Update script - update Nextclouds mimetype list
30+
- Moved mimteype update to nextcloud_configuration menu
31+
- Reworked office scripts
32+
- Update script - change crontab on all installations to 5 minutes
33+
- Fixed a bug with Netdata
34+
- Geoblock - updated link to csv file
35+
- Refactored the bitwarden_mailconfig script
36+
- Added more functionality to curl_to_dir
37+
- Docker documentserver - don't restart docker daemon upon installation
38+
- Restart notify push in some situations
39+
- Make sure sudo and software-properties-common is installed
40+
- Fixed password generation in edge cases
41+
- Reworked the cookielifetime script
42+
- Updated geoblock database - June 2021
43+
- Added option to check for 0-byte files
44+
- Changed from apt to apt-get
45+
- Simplified ClamAV notifications and small fix to fail2ban notification
46+
- Harden-SSH script - allow to set up 2FA authentication
47+
- SMB-server - added option to automatically empty recylce bins
48+
- SMB-server - added option to empty all recycle bins
49+
- SMB-server - Create the files directory for new users directly during the user creation
50+
- Reworked system-restore
51+
- Minor bugfixes and improvements
52+
- And more...
53+
54+
### Full changelog:
55+
- https://github.com/nextcloud/vm/compare/21.0.2..21.0.3
56+
- https://nextcloud.com/changelog/#latest21
57+
1858
## 21.0.2
1959

2060
### Small changelog:

‎apps/collabora_docker.sh

Lines changed: 3 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -17,66 +17,6 @@ debug_mode
1717
# Check if root
1818
root_check
1919

20-
# TODO: remove all functions with NC21.0.3 release
21-
remove_all_office_apps() {
22-
# remove OnlyOffice-documentserver if installed
23-
if is_app_installed documentserver_community
24-
then
25-
nextcloud_occ app:remove documentserver_community
26-
fi
27-
28-
# Disable OnlyOffice App if installed
29-
if is_app_installed onlyoffice
30-
then
31-
nextcloud_occ app:remove onlyoffice
32-
fi
33-
34-
# remove richdocumentscode-documentserver if installed
35-
if is_app_installed richdocumentscode
36-
then
37-
nextcloud_occ app:remove richdocumentscode
38-
fi
39-
40-
# Disable RichDocuments (Collabora App) if installed
41-
if is_app_installed richdocuments
42-
then
43-
nextcloud_occ app:remove richdocuments
44-
fi
45-
}
46-
add_to_trusted_domains() {
47-
local element="$1"
48-
local count=0
49-
print_text_in_color "$ICyan" "Adding $element to trusted domains..."
50-
while [ "$count" -le 10 ]
51-
do
52-
if [ "$(nextcloud_occ_no_check config:system:get trusted_domains "$count")" = "$element" ]
53-
then
54-
break
55-
elif [ -z "$(nextcloud_occ_no_check config:system:get trusted_domains "$count")" ]
56-
then
57-
nextcloud_occ_no_check config:system:set trusted_domains "$count" --value="$element"
58-
break
59-
else
60-
count=$((count+1))
61-
fi
62-
done
63-
}
64-
remove_from_trusted_domains() {
65-
local element="$1"
66-
local count=0
67-
print_text_in_color "$ICyan" "Removing $element from trusted domains..."
68-
while [ "$count" -lt 10 ]
69-
do
70-
if [ "$(nextcloud_occ_no_check config:system:get trusted_domains "$count")" = "$element" ]
71-
then
72-
nextcloud_occ_no_check config:system:delete trusted_domains "$count"
73-
break
74-
else
75-
count=$((count+1))
76-
fi
77-
done
78-
}
79-
8020
# Check if Collabora is already installed
8121
print_text_in_color "$ICyan" "Checking if Collabora is already installed..."
8222
if ! does_this_docker_exist 'collabora/code'
@@ -87,33 +27,7 @@ else
8727
# Ask for removal or reinstallation
8828
reinstall_remove_menu "$SCRIPT_NAME"
8929
# Removal
90-
# Check if Collabora is previously installed
91-
# If yes, then stop and prune the docker container
92-
docker_prune_this 'collabora/code'
93-
# Revoke LE
94-
SUBDOMAIN=$(input_box_flow "Please enter the subdomain you are using for Collabora, e.g: office.yourdomain.com")
95-
if [ -f "$CERTFILES/$SUBDOMAIN/cert.pem" ]
96-
then
97-
yes no | certbot revoke --cert-path "$CERTFILES/$SUBDOMAIN/cert.pem"
98-
REMOVE_OLD="$(find "$LETSENCRYPTPATH/" -name "$SUBDOMAIN*")"
99-
for remove in $REMOVE_OLD
100-
do rm -rf "$remove"
101-
done
102-
fi
103-
# Remove Apache2 config
104-
if [ -f "$SITES_AVAILABLE/$SUBDOMAIN.conf" ]
105-
then
106-
a2dissite "$SUBDOMAIN".conf
107-
restart_webserver
108-
rm -f "$SITES_AVAILABLE/$SUBDOMAIN.conf"
109-
fi
110-
# Disable RichDocuments (Collabora App) if activated
111-
if is_app_installed richdocuments
112-
then
113-
nextcloud_occ app:remove richdocuments
114-
fi
115-
# Remove trusted domain
116-
remove_from_trusted_domains "$SUBDOMAIN"
30+
remove_collabora_docker
11731
# Show successful uninstall if applicable
11832
removal_popup "$SCRIPT_NAME"
11933
fi
@@ -122,26 +36,8 @@ fi
12236
# If yes, then stop and prune the docker container
12337
if does_this_docker_exist 'onlyoffice/documentserver'
12438
then
125-
docker_prune_this 'onlyoffice/documentserver'
126-
# Revoke LE
127-
SUBDOMAIN=$(input_box_flow "Please enter the subdomain you are using for OnlyOffice, e.g: office.yourdomain.com")
128-
if [ -f "$CERTFILES/$SUBDOMAIN/cert.pem" ]
129-
then
130-
yes no | certbot revoke --cert-path "$CERTFILES/$SUBDOMAIN/cert.pem"
131-
REMOVE_OLD="$(find "$LETSENCRYPTPATH/" -name "$SUBDOMAIN*")"
132-
for remove in $REMOVE_OLD
133-
do rm -rf "$remove"
134-
done
135-
fi
136-
# Remove Apache2 config
137-
if [ -f "$SITES_AVAILABLE/$SUBDOMAIN.conf" ]
138-
then
139-
a2dissite "$SUBDOMAIN".conf
140-
restart_webserver
141-
rm -f "$SITES_AVAILABLE/$SUBDOMAIN.conf"
142-
fi
143-
# Remove trusted domain
144-
remove_from_trusted_domains "$SUBDOMAIN"
39+
# Removal
40+
remove_onlyoffice_docker
14541
fi
14642

14743
# Remove all office apps

‎apps/collabora_integrated.sh

Lines changed: 4 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -20,48 +20,6 @@ debug_mode
2020
# Check if root
2121
root_check
2222

23-
# TODO: remove all functions with NC21.0.3 release
24-
remove_all_office_apps() {
25-
# remove OnlyOffice-documentserver if installed
26-
if is_app_installed documentserver_community
27-
then
28-
nextcloud_occ app:remove documentserver_community
29-
fi
30-
31-
# Disable OnlyOffice App if installed
32-
if is_app_installed onlyoffice
33-
then
34-
nextcloud_occ app:remove onlyoffice
35-
fi
36-
37-
# remove richdocumentscode-documentserver if installed
38-
if is_app_installed richdocumentscode
39-
then
40-
nextcloud_occ app:remove richdocumentscode
41-
fi
42-
43-
# Disable RichDocuments (Collabora App) if installed
44-
if is_app_installed richdocuments
45-
then
46-
nextcloud_occ app:remove richdocuments
47-
fi
48-
}
49-
remove_from_trusted_domains() {
50-
local element="$1"
51-
local count=0
52-
print_text_in_color "$ICyan" "Removing $element from trusted domains..."
53-
while [ "$count" -lt 10 ]
54-
do
55-
if [ "$(nextcloud_occ_no_check config:system:get trusted_domains "$count")" = "$element" ]
56-
then
57-
nextcloud_occ_no_check config:system:delete trusted_domains "$count"
58-
break
59-
else
60-
count=$((count+1))
61-
fi
62-
done
63-
}
64-
6523
# Check if Collabora is installed using the new method
6624
if ! is_app_installed richdocumentscode
6725
then
@@ -84,56 +42,15 @@ fi
8442
# Check if Collabora is installed using the old method
8543
if does_this_docker_exist 'collabora/code'
8644
then
87-
msg_box "Your server is compatible with the new way of installing Collabora. \
88-
We will now remove the old docker and install the app from Nextcloud instead."
89-
# Remove docker image
90-
docker_prune_this 'collabora/code'
91-
# Revoke LE
92-
SUBDOMAIN=$(input_box_flow "Please enter the subdomain you are using for Collabora, e.g: office.yourdomain.com")
93-
if [ -f "$CERTFILES/$SUBDOMAIN/cert.pem" ]
94-
then
95-
yes no | certbot revoke --cert-path "$CERTFILES/$SUBDOMAIN/cert.pem"
96-
REMOVE_OLD="$(find "$LETSENCRYPTPATH/" -name "$SUBDOMAIN*")"
97-
for remove in $REMOVE_OLD
98-
do rm -rf "$remove"
99-
done
100-
fi
101-
# Remove Apache2 config
102-
if [ -f "$SITES_AVAILABLE/$SUBDOMAIN.conf" ]
103-
then
104-
a2dissite "$SUBDOMAIN".conf
105-
restart_webserver
106-
rm -f "$SITES_AVAILABLE/$SUBDOMAIN.conf"
107-
fi
108-
# Remove trusted domain
109-
remove_from_trusted_domains "$SUBDOMAIN"
45+
# Removal
46+
remove_collabora_docker
11047
fi
11148

11249
# Check if Onlyoffice is installed and remove every trace of it
11350
if does_this_docker_exist 'onlyoffice/documentserver'
11451
then
115-
msg_box "You can't run both Collabora and OnlyOffice on the same VM. We will now remove Onlyoffice from the server."
116-
# Remove docker image
117-
docker_prune_this 'onlyoffice/documentserver'
118-
# Revoke LE
119-
SUBDOMAIN=$(input_box_flow "Please enter the subdomain you are using for Onlyoffice, e.g: office.yourdomain.com")
120-
if [ -f "$CERTFILES/$SUBDOMAIN/cert.pem" ]
121-
then
122-
yes no | certbot revoke --cert-path "$CERTFILES/$SUBDOMAIN/cert.pem"
123-
REMOVE_OLD="$(find "$LETSENCRYPTPATH/" -name "$SUBDOMAIN*")"
124-
for remove in $REMOVE_OLD
125-
do rm -rf "$remove"
126-
done
127-
fi
128-
# Remove Apache2 config
129-
if [ -f "$SITES_AVAILABLE/$SUBDOMAIN.conf" ]
130-
then
131-
a2dissite "$SUBDOMAIN".conf
132-
restart_webserver
133-
rm -f "$SITES_AVAILABLE/$SUBDOMAIN.conf"
134-
fi
135-
# Remove trusted domain
136-
remove_from_trusted_domains "$SUBDOMAIN"
52+
# Removal
53+
remove_onlyoffice_docker
13754
fi
13855

13956
# Remove all office apps

0 commit comments

Comments
 (0)