mirror of
https://github.com/flynx/proxmox-utils.git
synced 2025-11-01 04:30:08 +00:00
Compare commits
No commits in common. "c82b6a23a1f277252da4116a1c862da36739b998" and "2ffd4b91a9b032c4a17a75a2fdbb87dcd58da55f" have entirely different histories.
c82b6a23a1
...
2ffd4b91a9
@ -24,7 +24,7 @@ DFL_ID=${DFL_ID:=1000}
|
|||||||
DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=nextcloud}
|
DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=nextcloud}
|
||||||
|
|
||||||
DFL_CORES=${DFL_CORES:=2}
|
DFL_CORES=${DFL_CORES:=2}
|
||||||
DFL_RAM=${DFL_RAM:=4096}
|
DFL_RAM=${DFL_RAM:=2048}
|
||||||
DFL_SWAP=${DFL_SWAP:=${DFL_RAM}}
|
DFL_SWAP=${DFL_SWAP:=${DFL_RAM}}
|
||||||
DFL_DRIVE=${DFL_DRIVE:=40}
|
DFL_DRIVE=${DFL_DRIVE:=40}
|
||||||
|
|
||||||
@ -118,14 +118,10 @@ done
|
|||||||
sed -z -i \
|
sed -z -i \
|
||||||
-e \"s/\\(trusted_domains[^)]*\\)/\\1${ADDRS}/\" \
|
-e \"s/\\(trusted_domains[^)]*\\)/\\1${ADDRS}/\" \
|
||||||
/var/www/nextcloud/config/config.php"
|
/var/www/nextcloud/config/config.php"
|
||||||
|
|
||||||
# set opcache.interned_strings_buffer...
|
|
||||||
PHP_VERSION=$(lxc-attach $ID -- php --version \
|
|
||||||
| sed -ne 's/^PHP \([0-9]\+\.[0-9]\+\).*/\1/p')
|
|
||||||
@ lxc-attach $ID -- bash -c "\
|
@ lxc-attach $ID -- bash -c "\
|
||||||
sed -i \
|
sed -i \
|
||||||
-e '/opcache.interned_strings_buffer/ a opcache.interned_strings_buffer=32' \
|
-e '/^\$CONFIG =/ a\ '\''opcache.interned_strings_buffer'\'' => 32,' \
|
||||||
/etc/php/${PHP_VERSION}/cli/php.ini"
|
/var/www/nextcloud/config/config.php"
|
||||||
|
|
||||||
# remove /index.php from urls...
|
# remove /index.php from urls...
|
||||||
# for more info see:
|
# for more info see:
|
||||||
@ -150,9 +146,7 @@ pctPushAssets $ID
|
|||||||
# Colabora...
|
# Colabora...
|
||||||
if ! [ -z $COLLABORA_OFFICE ] ; then
|
if ! [ -z $COLLABORA_OFFICE ] ; then
|
||||||
echo "# Collabora office..."
|
echo "# Collabora office..."
|
||||||
|
|
||||||
# coolwsd...
|
# coolwsd...
|
||||||
# XXX still need to make this work through a reverse proxy...
|
|
||||||
# see:
|
# see:
|
||||||
# https://sdk.collaboraonline.com/docs/installation/Configuration.html
|
# https://sdk.collaboraonline.com/docs/installation/Configuration.html
|
||||||
@ lxc-attach $ID -- bash -c "\
|
@ lxc-attach $ID -- bash -c "\
|
||||||
@ -163,7 +157,6 @@ if ! [ -z $COLLABORA_OFFICE ] ; then
|
|||||||
&& apt install -y coolwsd code-brand"
|
&& apt install -y coolwsd code-brand"
|
||||||
# XXX should these be set in here or as args in the coolwsd.service ???
|
# XXX should these be set in here or as args in the coolwsd.service ???
|
||||||
# /etc/coolwsd/coolwsd.xml
|
# /etc/coolwsd/coolwsd.xml
|
||||||
# XXX add groups...
|
|
||||||
# ssl>enable -> false
|
# ssl>enable -> false
|
||||||
@ lxc-attach $ID -- bash -c "\
|
@ lxc-attach $ID -- bash -c "\
|
||||||
sed -i \
|
sed -i \
|
||||||
@ -174,13 +167,6 @@ if ! [ -z $COLLABORA_OFFICE ] ; then
|
|||||||
sed -i \
|
sed -i \
|
||||||
'/<ssl /,+5{ s/\(<termination [^>]*>\)false\(<\/termination>\)/\1true\2/ }' \
|
'/<ssl /,+5{ s/\(<termination [^>]*>\)false\(<\/termination>\)/\1true\2/ }' \
|
||||||
/etc/coolwsd/coolwsd.xml"
|
/etc/coolwsd/coolwsd.xml"
|
||||||
# alias_groups...
|
|
||||||
@ lxc-attach $ID -- bash -c "\
|
|
||||||
sed -i \
|
|
||||||
-e '/<alias_groups .* mode=\"first\"/ s/mode=\"first\"/mode=\"groups\"/ ' \
|
|
||||||
-e '/<\/alias_groups>/ i\ <group><host allow=\"true\">https://${APP_DOMAIN}</host></group>' \
|
|
||||||
-e '/<\/alias_groups>/ i\ <group><host allow=\"true\">https://${CTHOSTNAME}.srv</host></group>' \
|
|
||||||
/etc/coolwsd/coolwsd.xml"
|
|
||||||
@ lxc-attach $ID -- systemctl restart coolwsd
|
@ lxc-attach $ID -- systemctl restart coolwsd
|
||||||
|
|
||||||
# apache2...
|
# apache2...
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user