Skip to content

Conversation

@Trozz
Copy link

@Trozz Trozz commented Aug 22, 2024

The OpenIDC branch appears to have been stale for quite a while, this merges the develop branch in to and resolves merge conflicts, normally with accepting both changes based on sensibilities (not many conflicts)

Conflicting files were

  • backend/templates/proxy_host.conf
  • docker/rootfs/etc/nginx/nginx.conf
  • docs/src/advanced-config/index.md
  • frontend/js/i18n/messages.json

jc21 and others added 30 commits May 10, 2023 09:57
Fix certbot plugins install when using PUID/PGID
Add dns wildcard certificate support for strato.de using the provided certbot plugin
…lude/ssl-ciphers.conf

nginx only uses the `ssl_protocols` directive in the `server{}` block of the first processed host config, which is the default config in `/etc/nginx/conf.d/default.conf`. in version `v2.9.20` the default ssl site was dropped by using `ssl_reject_handshake on` in the default host config. but beside the include of `conf.d/include/ssl-ciphers.conf` was removed from the default host config. that's why `tlsv1.3` isn't applied by default anymore, same thing with the defined cipher suites. npm is so broken since `2023-03-16`.

commit that broke the config -> NginxProxyManager@a7f0c3b
The default nginx 444 response drops the inbound connection without
sending any response to the client.
Do not install dns_plugin into the user site because it will lack sys.path precedence to urllib3 in /opt/certbot/lib/python3.7/site-packages
Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.0.0 to 4.1.3.
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](salesforce/tough-cookie@v4.0.0...v4.1.3)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
- Add support for bunny.net DNS challenges using @mwt's certbot-dns-bunny plugin.
Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [semver](https://github.com/npm/node-semver) from 7.3.2 to 7.5.4.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](npm/node-semver@v7.3.2...v7.5.4)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
…ndabot/npm_and_yarn/frontend/word-wrap-1.2.4

Bump word-wrap from 1.2.3 to 1.2.4 in /frontend
…ndabot/npm_and_yarn/backend/word-wrap-1.2.4

Bump word-wrap from 1.2.3 to 1.2.4 in /backend
…ndabot/npm_and_yarn/test/word-wrap-1.2.4

Bump word-wrap from 1.2.3 to 1.2.4 in /test
…ndabot/npm_and_yarn/frontend/semver-5.7.2

Bump semver from 5.7.1 to 5.7.2 in /frontend
…ndabot/npm_and_yarn/test/semver-7.5.4

Bump semver from 7.3.2 to 7.5.4 in /test
…ndabot/npm_and_yarn/backend/semver-5.7.2

Bump semver from 5.7.1 to 5.7.2 in /backend
…ndabot/npm_and_yarn/docs/tough-cookie-4.1.3

Bump tough-cookie from 4.0.0 to 4.1.3 in /docs
jinhei and others added 25 commits May 28, 2024 23:32
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](micromatch/braces@3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
This is useful when some user would want to change the default
log format for each of the service, without the need of creating a
new `log_format custom` and changing the `access_log` for each
service.
…ge_log_format_location

Changing `log_format proxy` default location
Signed-off-by: Dusan Cervenka <[email protected]>
Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/gulpjs/glob-parent/releases)
- [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md)
- [Commits](gulpjs/glob-parent@v5.1.1...v5.1.2)

---
updated-dependencies:
- dependency-name: glob-parent
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
In 2020, the concept of a single compose specification was introduced, removing the need for versioning.
Signed-off-by: Dusan Cervenka <[email protected]>
…ntax-cause-err

Fix syntax that causes errors (generateKeys log)
…ndabot/npm_and_yarn/backend/glob-parent-5.1.2

Bump glob-parent from 5.1.1 to 5.1.2 in /backend
…ndabot/npm_and_yarn/backend/braces-3.0.3

Bump braces from 3.0.2 to 3.0.3 in /backend
…admin

Read initial admin email and password from env vars
Remove spaces around Cloudflare API Credential
…patch-1

Add include for `root_top.conf` in the nginx.conf
…r configuration

- Use built in node functions to write the file
- And to delete the file
@jc21
Copy link
Member

jc21 commented Oct 11, 2024

Despite it failing CI, I'll merge it anyway. I think the Jenkinsfile may be different between the branches, the one on the openidc branch shouldn't be different than the one on develop

@jc21 jc21 closed this Oct 11, 2024
@jc21 jc21 reopened this Oct 11, 2024
@jc21 jc21 merged commit fdb22e4 into NginxProxyManager:openidc Oct 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.