external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-11 01:27:17 +00:00
Code Issues Releases Wiki Activity

Merge branch 'jammyjellyfish2204-nextcloud24' into jammyjellyfish2204-everything

Browse Source
This commit is contained in:
Steve Hay 2022-09-12 20:37:17 -04:00
commit 3f1f9b8455
1 changed files with 58 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
setup/nextcloud.sh
View File

@ -173,42 +173,6 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc
if [ ! -z ${CURRENT_NEXTCLOUD_VER} ]; then if [ ! -z ${CURRENT_NEXTCLOUD_VER} ]; then
# Database migrations from ownCloud are no longer possible because ownCloud cannot be run under # Database migrations from ownCloud are no longer possible because ownCloud cannot be run under
# PHP 7. # PHP 7.
# Need to set config_is_read_only to false to perform the 23-24 upgrade.
TIMEZONE=$(cat /etc/timezone)
CONFIG_TEMP=$(/bin/mktemp)
php$PHP_VER <<EOF > $CONFIG_TEMP && mv $CONFIG_TEMP $STORAGE_ROOT/owncloud/config.php;
<?php
include("$STORAGE_ROOT/owncloud/config.php");
\$CONFIG['config_is_read_only'] = false;
\$CONFIG['trusted_domains'] = array('$PRIMARY_HOSTNAME');
\$CONFIG['memcache.local'] = '\OC\Memcache\APCu';
\$CONFIG['overwrite.cli.url'] = '/cloud';
\$CONFIG['mail_from_address'] = 'administrator'; # just the local part, matches our master administrator address
\$CONFIG['logtimezone'] = '$TIMEZONE';
\$CONFIG['logdateformat'] = 'Y-m-d H:i:s';
\$CONFIG['mail_domain'] = '$PRIMARY_HOSTNAME';
\$CONFIG['user_backends'] = array(
array(
'class' => '\OCA\UserExternal\IMAP',
'arguments' => array(
'127.0.0.1', 143, null, null, false, false
),
),
);
echo "<?php\n\\\$CONFIG = ";
var_export(\$CONFIG);
echo ";";
?>
EOF
if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^[89] ]]; then if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^[89] ]]; then
echo "Upgrades from Mail-in-a-Box prior to v0.28 (dated July 30, 2018) with Nextcloud < 13.0.6 (you have ownCloud 8 or 9) are not supported. Upgrade to Mail-in-a-Box version v0.30 first. Setup will continue, but skip the Nextcloud migration." echo "Upgrades from Mail-in-a-Box prior to v0.28 (dated July 30, 2018) with Nextcloud < 13.0.6 (you have ownCloud 8 or 9) are not supported. Upgrade to Mail-in-a-Box version v0.30 first. Setup will continue, but skip the Nextcloud migration."
return 0 return 0
@ -227,6 +191,10 @@ EOF
InstallNextcloud 22.2.6 9d39741f051a8da42ff7df46ceef2653a1dc70d9 4.1.0 697f6b4a664e928d72414ea2731cb2c9d1dc3077 3.2.2 ce4030ab57f523f33d5396c6a81396d440756f5f 3.0.0 0df781b261f55bbde73d8c92da3f99397000972f InstallNextcloud 22.2.6 9d39741f051a8da42ff7df46ceef2653a1dc70d9 4.1.0 697f6b4a664e928d72414ea2731cb2c9d1dc3077 3.2.2 ce4030ab57f523f33d5396c6a81396d440756f5f 3.0.0 0df781b261f55bbde73d8c92da3f99397000972f
CURRENT_NEXTCLOUD_VER="22.2.6" CURRENT_NEXTCLOUD_VER="22.2.6"
fi fi
# Remove the read-onlyness of the config.
sed -ie '/config_is_read_only/d' $STORAGE_ROOT/owncloud/config.php
if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^22 ]]; then if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^22 ]]; then
InstallNextcloud 23.0.9 b6ac7ffa6c1c1c6187fea7d9efc7a32300cdc377 4.1.0 697f6b4a664e928d72414ea2731cb2c9d1dc3077 3.2.2 ce4030ab57f523f33d5396c6a81396d440756f5f 3.0.0 0df781b261f55bbde73d8c92da3f99397000972f InstallNextcloud 23.0.9 b6ac7ffa6c1c1c6187fea7d9efc7a32300cdc377 4.1.0 697f6b4a664e928d72414ea2731cb2c9d1dc3077 3.2.2 ce4030ab57f523f33d5396c6a81396d440756f5f 3.0.0 0df781b261f55bbde73d8c92da3f99397000972f
CURRENT_NEXTCLOUD_VER="23.0.9" CURRENT_NEXTCLOUD_VER="23.0.9"
@ -246,39 +214,38 @@ if [ ! -f $STORAGE_ROOT/owncloud/owncloud.db ]; then
# Create an initial configuration file. # Create an initial configuration file.
instanceid=oc$(echo $PRIMARY_HOSTNAME | sha1sum | fold -w 10 | head -n 1) instanceid=oc$(echo $PRIMARY_HOSTNAME | sha1sum | fold -w 10 | head -n 1)
cat > $STORAGE_ROOT/owncloud/config.php <<EOF; CONFIG_TEMP=/tmp/cfg-$instanceid.json
<?php cat > $CONFIG_TEMP <<EOF
\$CONFIG = array ( {
'datadirectory' => '$STORAGE_ROOT/owncloud', "system": {
"datadirectory": "$STORAGE_ROOT/owncloud",
'instanceid' => '$instanceid', "instanceid": "$instanceid",
"forcessl": true,
'forcessl' => true, # if unset/false, Nextcloud sends a HSTS=0 header, which conflicts with nginx config "overwritewebroot": "/cloud",
"overwrite.cli.url": "https://${PRIMARY_HOSTNAME}/cloud",
'overwritewebroot' => '/cloud', "user_backends": [
'overwrite.cli.url' => '/cloud', {
'user_backends' => array( "class": "\\\OCA\\\UserExternal\\\IMAP",
array( "arguments": [ "127.0.0.1", 143, null, null, false, false ]
'class' => '\OCA\UserExternal\IMAP', }
'arguments' => array( ],
'127.0.0.1', 143, null, null, false, false "memcache.local": "\\\OC\\\Memcache\\\APCu",
), "mail_smtpmode": "sendmail",
), "mail_smtpsecure": "",
), "mail_smtpauthtype": "LOGIN",
'memcache.local' => '\OC\Memcache\APCu', "mail_smtpauth": false,
'mail_smtpmode' => 'sendmail', "mail_smtphost": "",
'mail_smtpsecure' => '', "mail_smtpport": "",
'mail_smtpauthtype' => 'LOGIN', "mail_smtpname": "",
'mail_smtpauth' => false, "mail_smtppassword": "",
'mail_smtphost' => '', "mail_from_address": "owncloud"
'mail_smtpport' => '', }
'mail_smtpname' => '', }
'mail_smtppassword' => '',
'mail_from_address' => 'owncloud',
);
?>
EOF EOF
sudo -u www-data php8.0 /usr/local/lib/owncloud/occ config:import $CONFIG_TEMP
rm -f $CONFIG_TEMP
# Create an auto-configuration file to fill in database settings # Create an auto-configuration file to fill in database settings
# when the install script is run. Make an administrator account # when the install script is run. Make an administrator account
# here or else the install can't finish. # here or else the install can't finish.
@ -344,41 +311,31 @@ sudo -u www-data \
# the correct domain name if the domain is being change from the previous setup. # the correct domain name if the domain is being change from the previous setup.
# Use PHP to read the settings file, modify it, and write out the new settings array. # Use PHP to read the settings file, modify it, and write out the new settings array.
TIMEZONE=$(cat /etc/timezone) TIMEZONE=$(cat /etc/timezone)
CONFIG_TEMP=$(/bin/mktemp) instanceid=oc$(echo $PRIMARY_HOSTNAME | sha1sum | fold -w 10 | head -n 1)
php$PHP_VER <<EOF > $CONFIG_TEMP && mv $CONFIG_TEMP $STORAGE_ROOT/owncloud/config.php; CONFIG_TEMP=/tmp/cfg-$instanceid.json
<?php PHONE_REGION=$(locale | grep TELEPHONE | sed -e 's/LC_.*=".*_//' | sed -e 's/\..*//')
include("$STORAGE_ROOT/owncloud/config.php"); cat > $CONFIG_TEMP <<-EOF
{
\$CONFIG['config_is_read_only'] = true; "system": {
"config_is_read_only": true,
\$CONFIG['trusted_domains'] = array('$PRIMARY_HOSTNAME'); "trusted_domains": ["$PRIMARY_HOSTNAME"],
"memcache.local": "\\\OC\\\Memcache\\\APCu",
\$CONFIG['memcache.local'] = '\OC\Memcache\APCu'; "mail_from_address": "administrator",
\$CONFIG['overwrite.cli.url'] = 'https://$PRIMARY_HOSTNAME/cloud'; "logtimezone": "$TIMEZONE",
\$CONFIG['mail_from_address'] = 'administrator'; # just the local part, matches our master administrator address "logdateformat": "Y-m-d H:i:s",
"mail_domain": "$PRIMARY_HOSTNAME",
\$CONFIG['logtimezone'] = '$TIMEZONE'; "default_phone_region": "$PHONE_REGION",
\$CONFIG['logdateformat'] = 'Y-m-d H:i:s'; "user_backends": [
{
\$CONFIG['mail_domain'] = '$PRIMARY_HOSTNAME'; "class": "\\\OCA\\\UserExternal\\\IMAP",
\$CONFIG['default_phone_region'] = '$(locale | grep TELEPHONE | sed -e 's/LC_.*=".*_//' | sed -e 's/\..*//')'; "arguments": [ "127.0.0.1", 143, null, null, false, false ]
}
\$CONFIG['user_backends'] = array( ]
array( }
'class' => '\OCA\UserExternal\IMAP', }
'arguments' => array(
'127.0.0.1', 143, null, null, false, false
),
),
);
echo "<?php\n\\\$CONFIG = ";
var_export(\$CONFIG);
echo ";";
?>
EOF EOF
chown www-data.www-data $STORAGE_ROOT/owncloud/config.php sudo -u www-data php8.0 /usr/local/lib/owncloud/occ config:import $CONFIG_TEMP
rm -f $CONFIG_TEMP
# Set PHP FPM values to support large file uploads # Set PHP FPM values to support large file uploads
# (semicolon is the comment character in this file, hashes produce deprecation warnings) # (semicolon is the comment character in this file, hashes produce deprecation warnings)