Merge staging-next-21.05 into staging-21.05
This commit is contained in:
github-actions[bot]
GitHub
commit
ca68084d67
|
|
@ -84,47 +84,93 @@
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section xml:id="module-services-nextcloud-pitfalls-during-upgrade">
|
<section xml:id="module-services-nextcloud-pitfalls-during-upgrade">
|
||||||
<title>Pitfalls</title>
|
<title>Common problems</title>
|
||||||
|
<itemizedlist>
|
||||||
|
<listitem>
|
||||||
|
<formalpara>
|
||||||
|
<title>General notes</title>
|
||||||
|
<para>
|
||||||
|
Unfortunately Nextcloud appears to be very stateful when it comes to
|
||||||
|
managing its own configuration. The config file lives in the home directory
|
||||||
|
of the <literal>nextcloud</literal> user (by default
|
||||||
|
<literal>/var/lib/nextcloud/config/config.php</literal>) and is also used to
|
||||||
|
track several states of the application (e.g., whether installed or not).
|
||||||
|
</para>
|
||||||
|
</formalpara>
|
||||||
|
<para>
|
||||||
|
All configuration parameters are also stored in
|
||||||
|
<filename>/var/lib/nextcloud/config/override.config.php</filename> which is generated by
|
||||||
|
the module and linked from the store to ensure that all values from
|
||||||
|
<filename>config.php</filename> can be modified by the module.
|
||||||
|
However <filename>config.php</filename> manages the application's state and shouldn't be
|
||||||
|
touched manually because of that.
|
||||||
|
</para>
|
||||||
|
<warning>
|
||||||
|
<para>Don't delete <filename>config.php</filename>! This file
|
||||||
|
tracks the application's state and a deletion can cause unwanted
|
||||||
|
side-effects!</para>
|
||||||
|
</warning>
|
||||||
|
|
||||||
<para>
|
<warning>
|
||||||
Unfortunately Nextcloud appears to be very stateful when it comes to
|
<para>Don't rerun <literal>nextcloud-occ
|
||||||
managing its own configuration. The config file lives in the home directory
|
maintenance:install</literal>! This command tries to install the application
|
||||||
of the <literal>nextcloud</literal> user (by default
|
and can cause unwanted side-effects!</para>
|
||||||
<literal>/var/lib/nextcloud/config/config.php</literal>) and is also used to
|
</warning>
|
||||||
track several states of the application (e.g. whether installed or not).
|
</listitem>
|
||||||
</para>
|
<listitem>
|
||||||
|
<formalpara>
|
||||||
<para>
|
<title>Multiple version upgrades</title>
|
||||||
All configuration parameters are also stored in
|
<para>
|
||||||
<literal>/var/lib/nextcloud/config/override.config.php</literal> which is generated by
|
Nextcloud doesn't allow to move more than one major-version forward. E.g., if you're on
|
||||||
the module and linked from the store to ensure that all values from <literal>config.php</literal>
|
<literal>v16</literal>, you cannot upgrade to <literal>v18</literal>, you need to upgrade to
|
||||||
can be modified by the module.
|
<literal>v17</literal> first. This is ensured automatically as long as the
|
||||||
However <literal>config.php</literal> manages the application's state and shouldn't be touched
|
<link linkend="opt-system.stateVersion">stateVersion</link> is declared properly. In that case
|
||||||
manually because of that.
|
the oldest version available (one major behind the one from the previous NixOS
|
||||||
</para>
|
release) will be selected by default and the module will generate a warning that reminds
|
||||||
|
the user to upgrade to latest Nextcloud <emphasis>after</emphasis> that deploy.
|
||||||
<warning>
|
</para>
|
||||||
<para>Don't delete <literal>config.php</literal>! This file
|
</formalpara>
|
||||||
tracks the application's state and a deletion can cause unwanted
|
</listitem>
|
||||||
side-effects!</para>
|
<listitem>
|
||||||
</warning>
|
<formalpara>
|
||||||
|
<title><literal>Error: Command "upgrade" is not defined.</literal></title>
|
||||||
<warning>
|
<para>
|
||||||
<para>Don't rerun <literal>nextcloud-occ
|
This error usually occurs if the initial installation
|
||||||
maintenance:install</literal>! This command tries to install the application
|
(<command>nextcloud-occ maintenance:install</command>) has failed. After that, the application
|
||||||
and can cause unwanted side-effects!</para>
|
is not installed, but the upgrade is attempted to be executed. Further context can
|
||||||
</warning>
|
be found in <link xlink:href="https://github.com/NixOS/nixpkgs/issues/111175">NixOS/nixpkgs#111175</link>.
|
||||||
|
</para>
|
||||||
<para>
|
</formalpara>
|
||||||
Nextcloud doesn't allow to move more than one major-version forward. If you're e.g. on
|
<para>
|
||||||
<literal>v16</literal>, you cannot upgrade to <literal>v18</literal>, you need to upgrade to
|
First of all, it makes sense to find out what went wrong by looking at the logs
|
||||||
<literal>v17</literal> first. This is ensured automatically as long as the
|
of the installation via <command>journalctl -u nextcloud-setup</command> and try to fix
|
||||||
<link linkend="opt-system.stateVersion">stateVersion</link> is declared properly. In that case
|
the underlying issue.
|
||||||
the oldest version available (one major behind the one from the previous NixOS
|
</para>
|
||||||
release) will be selected by default and the module will generate a warning that reminds
|
<itemizedlist>
|
||||||
the user to upgrade to latest Nextcloud <emphasis>after</emphasis> that deploy.
|
<listitem>
|
||||||
</para>
|
<para>
|
||||||
|
If this occurs on an <emphasis>existing</emphasis> setup, this is most likely because
|
||||||
|
the maintenance mode is active. It can be deactivated by running
|
||||||
|
<command>nextcloud-occ maintenance:mode --off</command>. It's advisable though to
|
||||||
|
check the logs first on why the maintenance mode was activated.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<warning><para>Only perform the following measures on
|
||||||
|
<emphasis>freshly installed instances!</emphasis></para></warning>
|
||||||
|
<para>
|
||||||
|
A re-run of the installer can be forced by <emphasis>deleting</emphasis>
|
||||||
|
<filename>/var/lib/nextcloud/config/config.php</filename>. This is the only time
|
||||||
|
advisable because the fresh install doesn't have any state that can be lost.
|
||||||
|
In case that doesn't help, an entire re-creation can be forced via
|
||||||
|
<command>rm -rf ~nextcloud/</command>.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
</itemizedlist>
|
||||||
|
</listitem>
|
||||||
|
</itemizedlist>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section xml:id="module-services-nextcloud-httpd">
|
<section xml:id="module-services-nextcloud-httpd">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3
|
{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3
|
||||||
, gtk-doc, docbook_xsl, docbook_xml_dtd_43
|
, gtk-doc, docbook_xsl, docbook_xml_dtd_43
|
||||||
, libxml2, gnome, gobject-introspection, libsoup, totem-pl-parser }:
|
, libxml2, gnome, gobject-introspection, libsoup, totem-pl-parser }:
|
||||||
|
|
||||||
|
|
@ -16,6 +16,14 @@ in stdenv.mkDerivation rec {
|
||||||
sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i";
|
sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
name = "CVE-2021-39365.patch";
|
||||||
|
url = "https://gitlab.gnome.org/GNOME/grilo/-/commit/cd2472e506dafb1bb8ae510e34ad4797f63e263e.patch";
|
||||||
|
sha256 = "1i1p21vlms43iawg4dl1dibnpsbnkx27kcfvllnx76q07bfrpwzm";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
setupHook = ./setup-hook.sh;
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue