From beff85eed3398ebe29ea07c6321892726f64c5f1 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Thu, 15 Jul 2021 09:19:18 +0200
Subject: [PATCH] fix some documentation, fix nextcloud build
---
docs/installation_instructions.rst | 19 +++++++++++--------
flux2/infrastructure/sources/nextcloud.yaml | 3 +--
install/overrides/oas-nextcloud-override.yaml | 2 ++
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/docs/installation_instructions.rst b/docs/installation_instructions.rst
index a3895dd22..a34fd018c 100644
--- a/docs/installation_instructions.rst
+++ b/docs/installation_instructions.rst
@@ -54,14 +54,17 @@ You should also have a trusted machine to run the installer on (we call this the
``provisioning machine``). All the commands listed in these instructions should
be run on the provisioning machine, unless specified otherwise:
-- You need Python 3 with its development files, Pip and Git installed
- (``apt install python3-pip python3-dev git``)
-- We recommend using a `python
- virtualenv <https://docs.python.org/3/tutorial/venv.html>`__ to make
- sure we do not change any of your other projects. Install virtualenv
- by running ``pip3 install --user venv`` or
- ``apt install python3-venv``
-- ``ssh-agent`` to give you access to your VPS
+- You need Python 3 with its development files, Pip and Git installed
+ (``apt install python3-pip python3-dev git``)
+- We recommend using a `python
+ virtualenv <https://docs.python.org/3/tutorial/venv.html>`__ to make
+ sure we do not change any of your other projects. Install virtualenv
+ by running ``pip3 install --user venv`` or
+ ``apt install python3-venv``
+- ``ssh-agent`` to give you access to your VPS
+- ``kubectl``, installable with ``snap install kubectl``
+- ``flux``, follow the `flux documentation
+ <https://fluxcd.io/docs/installation/#install-the-flux-cli>`__
Getting the installation script
-------------------------------
diff --git a/flux2/infrastructure/sources/nextcloud.yaml b/flux2/infrastructure/sources/nextcloud.yaml
index 01b9f6289..9699b539f 100644
--- a/flux2/infrastructure/sources/nextcloud.yaml
+++ b/flux2/infrastructure/sources/nextcloud.yaml
@@ -13,5 +13,4 @@ spec:
# For all available options, see:
# https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
ref:
- # tag: 0.2.8
- branch: 967-prevent-loss-of-onlyoffice-documents
+ tag: 0.2.9
diff --git a/install/overrides/oas-nextcloud-override.yaml b/install/overrides/oas-nextcloud-override.yaml
index f81c0f172..5d09e2c58 100644
--- a/install/overrides/oas-nextcloud-override.yaml
+++ b/install/overrides/oas-nextcloud-override.yaml
@@ -7,6 +7,8 @@ data:
values.yaml: |
# By overriding these values, Nextcloud and ONLYOFFICE will work on ACME
# staging certificates.
+ # WARNING: ONLYOFFICE can not save files back to nextcloud if you use
+ # staging certificates. Only use this for testing purposes!
onlyoffice:
unauthorizedStorage: true
httpsHstsEnabled: false
--
GitLab