Skip to content

Commit abb45e2

Browse files
authored
Update external docs
1 parent 3f7a4e5 commit abb45e2

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

external/bots/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ For managing these images:
3232

3333
- `image-download`: Download selected or all test images
3434
- `image-create`: Create test machine images from scratch (usually through
35-
virt-install or downloading a cloud image), with common build and test
36-
dependencies for Cockpit projects preinstalled
35+
downloading a cloud image), with common build and test dependencies for
36+
Cockpit projects preinstalled
3737
- `image-upload`: Upload a locally built test image to the official image servers
3838

3939
For running and debugging the images:

external/wiki/Demos-and-Talks.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ source: https://github.com/cockpit-project/cockpit/wiki/Demos-and-Talks
44
---
55

66
### 2024
7-
* [Upstream cross-project testing: Never break your API consumers](https://pretalx.com/devconf-cz-2024/talk/KDZZES/) (Martin Pitt), devconf.cz; [video](https://www.youtube.com/live/ipb-_rgFNa4?si=7qSWYaE3CETZMtaW&t=14200), [slides and notes](https://github.com/cockpit-project/presentations/tree/main/2024-upstream-cross-project-testing)
7+
* [Upstream cross-project testing: Never break your API consumers](https://pretalx.com/devconf-cz-2024/talk/KDZZES/) (Martin Pitt), devconf.cz; [video](https://www.youtube.com/watch?v=LyXOdDV98LM), [slides and notes](https://github.com/cockpit-project/presentations/tree/main/2024-upstream-cross-project-testing)
8+
* [How we integrated Btrfs in Cockpit](https://pretalx.com/devconf-cz-2024/talk/JEPNDF/) (Jelle van der Waa), devconf.cz; [video](https://youtu.be/ipb-_rgFNa4?t=4594), [slides](https://pretalx.com/media/devconf-cz-2024/submissions/JEPNDF/resources/Cockpit_Btrfs_vS8beTQ.pdf)
89

910
### 2023
1011
* [Monty Python's Flying Cockpit](https://devconfcz2023.sched.com/event/3e54fcb5b2f905fedc4810af54ce29c8) (Allison Karlitskaya and Martin Pitt), devconf.cz; [video](https://www.youtube.com/watch?v=ZAVUG6E0Xd4), [slides and notes](https://github.com/cockpit-project/presentations/tree/main/2023-devconf-beipack-pybridge)

external/wiki/Proxying-Cockpit-over-Apache-with-LetsEncrypt.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,9 @@ Make sure you changed `/etc/cockpit/cockpit.conf` to include the following:
109109

110110
```ini
111111
[WebService]
112-
Origins = https://cockpit.your-domain.com http://127.0.0.1:9090
112+
Origins = https://cockpit.your-domain.com wss://127.0.0.1:9090
113113
ProtocolHeader = X-Forwarded-Proto
114+
ForwardedForHeader = X-Forwarded-For
114115
AllowUnencrypted = true
115116
```
116117

0 commit comments

Comments
 (0)