bero/test
1
0
Fork 0
Code Issues 52 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Added OS check, LDAP envs for connector, and Nextcloud app icon order

Browse Source
This commit is contained in:
Derek Crudgington 2023-02-09 15:37:12 +00:00
parent fda5b6ba4c
commit b1f1ab9d05
3 changed files with 79 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/checks.sh
View File

@ -95,3 +95,13 @@ check_ports() {
done
fi
}
check_os() {
OSRELEASE=`grep "VERSION=" /etc/os-release | awk -F\" '{ print $2 }'`
if [ "$OSRELEASE" != "22.04 LTS (Jammy Jellyfish)" ]; then
echo -ne "\nFederated requires a minimum of 1G of RAM and 25G of storage\n \
running Ubuntu 22.04 LTS. Your system is not supported. Please contact\n \
Federated @ support@federated.computer for assistance or choose our\n \
cloud offerings at https://cloud.federated.computer.\n\n"
fi
}

7
lib/connector.sh
View File

@ -42,9 +42,16 @@ networks:
external: true
EOF
COOKIE_SECRET=`dd if=/dev/urandom bs=1K count=1 2>/dev/null | md5sum | awk '{ print $1 }'`
cat > /federated/apps/connector/.env <<EOF
DOMAIN=$DOMAIN
IMAGE_VERSION="latest"
LDAP_URL=ldap://ldap.$DOMAIN
LDAP_BASE_DN=dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
LDAP_ADMIN_USERNAME=admin
LDAP_ADMIN_PASSWORD=$LDAP_SECRET
COOKIE_SECRET=$COOKIE_SECRET
VIRTUAL_PROTO=http
VIRTUAL_PORT=3000
VIRTUAL_HOST=connector.$DOMAIN

65
lib/nextcloud.sh
View File

@ -119,6 +119,63 @@ ENV NEXTCLOUD_UPDATE=1
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
EOF
cat > /federated/apps/nextcloud/data/sidemenu.config.json <<EOF
{
"apps": {
"side_menu": {
"background-color-opacity": "100",
"current-app-background-color": "#005b8d",
"types": "",
"enabled": "yes",
"text-color": "#ffffff",
"loader-color": "#339bd4",
"types": "",
"always-displayed": "0",
"big-menu": "0",
"side-with-categories": "0",
"background-color": "#0068a1",
"background-color-to": "#0068a1",
"icon-invert-filter": "0",
"icon-opacity": "100",
"opener": "side-menu-opener",
"dark-mode-background-color": "#0068a1",
"dark-mode-background-color-to": "#0068a1",
"dark-mode-background-color-opacity": "100",
"dark-mode-current-app-background-color": "#005b8d",
"dark-mode-text-color": "#ffffff",
"dark-mode-loader-color": "#ffffff",
"dark-mode-icon-invert-filter": "0",
"dark-mode-icon-opacity": "100",
"dark-mode-opener": "side-menu-opener",
"opener-position": "before",
"opener-only": "0",
"hide-when-no-apps": "0",
"opener-hover": "0",
"display-logo": "1",
"use-avatar": "0",
"add-logo-link": "1",
"big-menu-hidden-apps": "[]",
"show-settings": "0",
"size-icon": "normal",
"size-text": "normal",
"target-blank-apps": "[]",
"loader-enabled": "1",
"top-side-menu-apps": "[]",
"top-menu-mouse-over-hidden-label": "0",
"apps-order": "[\"dashboard\",\"mail\",\"calendar\",\"contacts\",\"notes\",\"tasks\",\"files\",\"deck\",\"bookmarks\",\"forms\",\"spreed\",\"photos\",\"activity\"]",
"categories-order-type": "default",
"categories-custom": "[]",
"apps-categories-custom": "[]",
"categories-order": "[\"other\",\"customization\",\"dashboard\",\"external_links\",\"files\",\"workflow\",\"games\",\"integration\",\"monitoring\",\"multimedia\",\"office\",\"organization\",\"search\",\"security\",\"social\",\"tools\"]",
"default-enabled": "1",
"force": "0",
"top-menu-apps": "[\"photos\",\"activity\",\"dashboard\",\"forms\",\"calendar\",\"tasks\",\"bookmarks\",\"deck\",\"contacts\",\"notes\",\"spreed\",\"mail\",\"files\"]",
"cache": "2"
}
}
}
EOF
cat > /federated/apps/nextcloud/data/nextcloud.sh <<EOF
#!/bin/sh
@ -176,12 +233,14 @@ ADMINUUID=\`./occ user:list | grep admin | awk '{ print \$2 }' | awk -F: '{ prin
./occ app:enable bookmarks
./occ app:enable forms
./occ app:enable spreed
./occ app:enable side_menu
./occ mail:account:create \$ADMINUUID admin admin@$DOMAIN mail.$DOMAIN 993 ssl admin@$DOMAIN $ADMINPASS mail.$DOMAIN 465 ssl admin@$DOMAIN $ADMINPASS password
./occ app:enable richdocuments
./occ config:app:set --value https:\/\/collabora.$DOMAIN richdocuments public_wopi_url
./occ config:app:set --value https:\/\/collabora.$DOMAIN richdocuments wopi_url
./occ config:app:set --value ooxml richdocuments doc_format
./occ config:app:set --value "" richdocuments disable_certificate_verification
./occ config:import sidemenu.config.json
EOF
chmod +x /federated/apps/nextcloud/data/nextcloud.sh
@ -221,9 +280,9 @@ start_nextcloud() {
done
fi
# Move nextcloud.sh and set nextcloud.sh executable
mv /federated/apps/nextcloud/data/nextcloud.sh /federated/apps/nextcloud/data/var/www/html/
docker exec -it nextcloud chown www-data:root /var/www/html/nextcloud.sh
# Move nextcloud.sh and sidemenu config, set nextcloud.sh executable
mv /federated/apps/nextcloud/data/nextcloud.sh /federated/apps/nextcloud/data/sidemenu.config.json /federated/apps/nextcloud/data/var/www/html/
docker exec -it nextcloud chown www-data:root /var/www/html/nextcloud.sh /var/www/html/sidemenu.config.json
docker exec -it nextcloud chmod 755 /var/www/html/nextcloud.sh
[ $? -ne 0 ] && fail "Couldn't chown nextcloud.sh in /federated/apps/nextcloud container"