Commit Graph

244 Commits (main)

Author SHA1 Message Date
Evilham 1087c5c513 [NC] Rework image to self-configure as opposed to using dd-ctl
By managing volumes in a better fashion and using code that is closer
to being idempotent, while being declarative, we achieve an image that
is closer to the original one, but gets the plugins that we want and
the configuration that we want for integration with DD.

Closes #9. This image now allows for BBB_HOST and BBB_API_SECRET as
variables in dd.conf, which also configure the corresponding plugin on
Nextcloud.

This is a necessary update-step towards NC25, and temporarily disables
the forms plugin.
2023-04-12 09:42:41 +00:00
elena ff78c2f489 Revert "new feature: display user name on user menu header"
This reverts commit 006add66c4.
2023-04-12 09:36:04 +00:00
elena 9280979392 Revert "displayed nextcloud user menu like moodle and wp applications"
This reverts commit 5d5ef2f884.
2023-04-12 09:35:58 +00:00
elena 2cb1541d2e Revert "displayed nextcloud user menu like moodle and wp applications - not for admins!"
This reverts commit 6db2b8c60f.
2023-04-12 09:35:43 +00:00
Elena Barrios Galán 79b4d246ea Update dd-ctl- mod_attendance and geogebra 2023-04-04 07:40:57 +00:00
Elena Barrios Galán eb75377dd3 Revert ":q!Merge branch 'main' into feature/nextcloud_menu_settings"
This reverts commit 4e64f57c55
2023-04-04 07:29:40 +00:00
elena 28430d8fe2 merge with main conflicts solved 2023-04-03 08:45:40 +00:00
elena 72750e3cc5 conflicts found solved 2023-04-03 08:32:51 +00:00
elena 4e64f57c55 :q!Merge branch 'main' into feature/nextcloud_menu_settings 2023-03-31 09:28:42 +00:00
Evilham b61286cf97
[docs] UPDATING: document upgrade to NC 25.0.5
Along with the newly supported dd.conf variables and the docker image
rework.
2023-03-31 10:38:22 +02:00
Evilham 4683abd221
[NC] Add FORCED_LANGUAGE setting
This has been requested by schools.
2023-03-31 10:38:02 +02:00
Evilham a4f51d1023
[NC] Enable video previews as requested by schools 2023-03-31 10:28:35 +02:00
Evilham e55534312d
[NC] Disable ownpad app as requested by schools 2023-03-31 10:28:27 +02:00
Evilham 7196db9c14
[NC] Upgrade to Nextcloud 25.0.5
This still uses a fork of nextcloud/forms and reenables that plugin.

Since version 25 of Nextcloud uses the 2.X line of the nextcloud/mail
plugin, which already includes our patches, we can get rid of them to
easen future maintenance.
2023-03-31 10:27:48 +02:00
Evilham 010a04bf37
[NC] Rework image to self-configure as opposed to using dd-ctl
By managing volumes in a better fashion and using code that is closer
to being idempotent, while being declarative, we achieve an image that
is closer to the original one, but gets the plugins that we want and
the configuration that we want for integration with DD.

Closes #9. This image now allows for BBB_HOST and BBB_API_SECRET as
variables in dd.conf, which also configure the corresponding plugin on
Nextcloud.

This is a necessary update-step towards NC25, and temporarily disables
the forms plugin.
2023-03-31 10:24:20 +02:00
Evilham d8126abd15
[stress-tests] Adapt for NC 25
This still supports NC24

While there, configure JMeter to restart threads instead of stopping them.

This keeps the load on the target server.
2023-03-31 10:22:13 +02:00
elena 0f77b92958 mod_attendance and mod_geogebra will be installed by default on moodle 2023-03-22 11:58:30 +00:00
elena 44d4353640 Merge branch 'main' into feature/nextcloud_menu_settings 2023-03-22 10:54:34 +00:00
Evilham bda59a5455
[docs] UPDATING: document upgrade to NC 25.0.4
Along with the newly supported dd.conf variables and the docker image
rework.
2023-03-14 17:02:32 +01:00
Evilham 7e2c748f51
[NC] Enable video previews as requested by schools 2023-03-14 17:02:06 +01:00
Evilham 60d4abf2f8
[NC] Disable ownpad app as requested by schools 2023-03-14 17:01:38 +01:00
Evilham e5d2a20d37
[NC] Upgrade to Nextcloud 25.0.4
This still uses a fork of nextcloud/forms and reenables that plugin.

Since version 25 of Nextcloud uses the 2.X line of the nextcloud/mail
plugin, which already includes our patches, we can get rid of them to
easen future maintenance.
2023-03-14 16:59:38 +01:00
Evilham a27f44262b
[NC] Rework image to self-configure as opposed to using dd-ctl
By managing volumes in a better fashion and using code that is closer
to being idempotent, while being declarative, we achieve an image that
is closer to the original one, but gets the plugins that we want and
the configuration that we want for integration with DD.

Closes #9. This image now allows for BBB_HOST and BBB_API_SECRET as
variables in dd.conf, which also configure the corresponding plugin on
Nextcloud.

This is a necessary update-step towards NC25, and temporarily disables
the forms plugin.
2023-03-14 09:30:59 +01:00
elena 6db2b8c60f displayed nextcloud user menu like moodle and wp applications - not for admins! 2023-03-08 11:53:01 +00:00
elena 5d5ef2f884 displayed nextcloud user menu like moodle and wp applications 2023-03-08 11:32:57 +00:00
elena 006add66c4 new feature: display user name on user menu header 2023-03-08 08:47:23 +00:00
Evilham 76328fccc8
[NC] [mail] patch minor version update
We still need this for NC 24
2023-03-02 12:22:36 +01:00
Evilham 5d32e53081
[docs] Fix links in stress-test docs 2023-03-01 23:22:10 +01:00
Evilham 96e5ce8f33
[stress-tests] Fix typo when finding sysbench binary
We were erroneously looking for the sysbench2 binary.

While there unify naming and add direct links from the documentation
to each mentioned file.
2023-03-01 12:39:19 +01:00
Evilham c83c925734
[docs] UPDATING: document upgrade to NC 24.0.10
No further changes intended.
2023-02-28 08:43:40 +01:00
Evilham 65b90724bd
[NC] Upgrade to Nextcloud 24.0.10
This is the latest Nextcloud 24 version as of 2023-02-28.
2023-02-28 08:37:10 +01:00
Evilham 567bfd770d
[stress-tests] Documentation + necessary files to perform testing
By executing tests in this normalised fashion it is easier to compare
results between different instances or different patch levels.

Roughly speaking there are two kinds of tests:

- VM tests: which summarise general performance of the instance,
  without taking DD into account
- DD tests: which simulates many logins and interactions with DD,
  while recording the session as a user would pereceive it from a
  browser

By using these we should be able to consistently compare and improve
performance.

The original dd-stress-test.tpl.jmx tests file was prepared by
Teradisk  with hardcoded instance, threadcount and duration values.

Testing should now be performed with `vm-test.sh` and `dd-test.sh`
respectively, and the template file should stay generic.
2023-02-28 08:25:42 +01:00
elena eb6c14958b changes suggested 2023-02-27 10:53:11 +00:00
elena 0888c2ba05 changes suggested 2023-02-27 10:53:11 +00:00
elena 944505ab72 image missing 2023-02-27 10:53:11 +00:00
elena 92c5828b33 admin avatar added 2023-02-27 10:53:11 +00:00
Jose Antonio Exposito Garcia 358004899b add yoututbe video in wp 2023-02-21 09:24:32 +00:00
elena 895bd122ef new font LeagueSpartan added 2023-02-17 14:16:44 +00:00
elena 647191497d new fonts 2023-02-17 14:41:20 +01:00
elena 7ac06ef82c new megamenu style 2023-02-17 13:22:24 +00:00
elena d449bff1d1 Merge branch 'main' into feature/menuandfonts 2023-02-17 12:26:03 +00:00
Evilham ed44b8d3d2
[sso-api] Fix SocketIO transitive dependency (dnspython)
Flask-SocketIO depends on dnspython but dnspython 2.3 removes
dns.rdtypes.ANY, which is needed by Flask-SocketIO so we keep it below
version 2.3

We had missed Flask-SocketIO being a dependency on API when fixing the
issue for admin.
2023-02-03 11:40:13 +01:00
Evilham e15a3b760c
[dd.conf] Cleanup some variables
While at it, also ensure that API_SECRET gets rotated when running
./dd-ctl securize
2023-01-20 11:40:03 +01:00
Evilham a72001dea5
[docker] Cleanup environment files
By having the environment explicit on each service, we both document
the settings and have more control over what each service is allowed
to see.

This avoids weird things like nginx having access to postgresql's
credentials on its environment.

As a bonus: we are able to use one single environment file, which is
basically dd.conf with some values that are dynamically-calculated and
added from dd-ctl.
2023-01-20 11:40:03 +01:00
Evilham affbbde9d3
[NC] Reduce upstream diff and improve env vars
By keeping the dfif against upstream we can follow them easier over
time.

And by having env vars explicit, we can get rid of the auxiliary env
files.
2023-01-20 11:40:03 +01:00
Evilham 1d077b71f9
[sso-admin] Fix SocketIO transitive dependency (dnspython)
Flask-SocketIO depends on dnspython but dnspython 2.3 removes
dns.rdtypes.ANY, which is needed by Flask-SocketIO so we keep it below
version 2.3
2023-01-20 11:29:51 +01:00
Evilham c9af7242c0
[NC] Work arround issue nextcloud/server#33751
That issue is fixed in NC 25, but it will likely not be backported to
NC 24.

It produces issues when modifying users and not modifying their
display name.

See also:	https://github.com/nextcloud/server/issues/33751
2023-01-13 11:26:12 +01:00
Evilham f4a3d38384
[NC] Update mail plugin patch for NC 24
This is still not on release line supporting NC 24 line (v1.15.1) and
having an older appinfo may be producing issues.
2023-01-12 11:45:51 +01:00
Evilham ea995c0336
[dd-ctl] Force DD_DEFAULT_BUILD length to 8 hex digits
This is used to tag Docker images in the registry / pull images form
the registry, it has been observed in the wiled that:

    git rev-parse --short

can have different default values for its length depending on the
system.

We currently specify the length to be 8 as specified here:
https://git-scm.com/docs/git-rev-parse#Documentation/git-rev-parse.txt---shortlength
2023-01-03 10:18:54 +01:00
elena c7b032ec2e feature/menuandfonts: new menu styles and fonts 2023-01-02 13:46:01 +00:00