external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-25 03:36:56 +00:00
Code Issues Releases Wiki Activity

Wording changes

Browse Source
This commit is contained in:
downtownallday 2020-06-14 20:22:14 -04:00
parent 979c36b8c1
commit 7de362a168
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -16,7 +16,7 @@ To integrate Mail-in-a-Box w/LDAP (MiaB-LDAP) with Nextcloud, changes must be ma
**On MiaB-LDAP**
Enable the setup mod `remote-nextcloud.sh` by creating the directory `local` and creating a symbolic link to it. Do this by running this command from the mailinabox directory: `ln -s ../setup/mods.available/remote-nextcloud.sh local/remote-nextcloud.sh`. *During setup you will be prompted for the hostname and web prefix of your remote Nextcloud box.*
Enable the setup mod `remote-nextcloud.sh` by creating the directory `local` in the directory where mailinabox is installed (usually $HOME/mailinabox), then creat a symbolic link to remote-nextcloud.sh. e.g. run this command from the mailinabox directory: `mkdir -p local; ln -s ../setup/mods.available/remote-nextcloud.sh local/remote-nextcloud.sh`. *During setup you will be prompted for the hostname and web prefix of your remote Nextcloud box.*
The setup mod will configure Roundcube and Z-Push (ActiveSync) to use the remote Nextcloud for contacts and calendar instead of the local Nextcloud, which will be disabled (browsing to /cloud will fail).

7
tests/system-setup/upgrade-from-upstream.sh
View File

@ -203,6 +203,7 @@ capture_state() {
}
miab_ldap_install() {
H1 "INSTALL MIAB-LDAP"
# ensure we're in a MiaB-LDAP working directory
if [ ! -e setup/ldap.sh ]; then
die "The working directory is not MiaB-LDAP!"
@ -217,7 +218,7 @@ compare_state() {
local output
local changed="false"
H1 "COMPARE STATES $(basename "$s1") TO $(basename "$2")"
H1 "COMPARE STATES: $(basename "$s1") VS $(basename "$2")"
H2 "Users"
# users
output="$(diff "$s1/users.json" "$s2/users.json" 2>&1)"
@ -226,7 +227,7 @@ compare_state() {
echo "USERS ARE DIFFERENT!"
echo "$output"
else
echo "OK"
echo "No change"
fi
H2 "Aliases"
@ -236,7 +237,7 @@ compare_state() {
echo "ALIASES ARE DIFFERENT!"
echo "$output"
else
echo "OK"
echo "No change"
fi
H2 "DNS - zones missing"