Merge from staging #65

Merged
muppeth merged 4 commits from staging into main 2024-03-21 17:39:47 +01:00
Owner

Main changes:

  • Rewritten way of creating HTTPS hosts. Prevents creating HTTPS vhost without existing certificate.
  • Break out conditions into a list.
Main changes: - Rewritten way of creating HTTPS hosts. Prevents creating HTTPS vhost without existing certificate. - Break out conditions into a list.
muppeth added 3 commits 2024-03-09 01:07:56 +01:00
002e1183fc Vhosts creation change (#63)
Changed the way vhosts are created. This is to prevent situation where https vhosts are created without corresponding certificate which is  causing error. Solution to that is to check if ssl cert exists for vhost before creating them.

Suggested approach is to create vhost called '01.letsencrypt' or `01.domain.ltd` using `letsencrypt` template. This will allow new certificates to be created for upcoming vhosts and once certs are  created, nginx will be able to create vhosts and not error out.  (so first run letsencrypt and then nginx).

Currently vhost creation and enabling is done separate for HTTP and HTTPS vhosts. Not the best solution, but works for now.

Reviewed-on: #63
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@disroot.org>
Co-committed-by: muppeth <muppeth@disroot.org>
5646a553fc bump to cryptpad 5.7.0 (#62)
Reviewed-on: #62
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-committed-by: meaz <meaz@disroot.org>
meaz approved these changes 2024-03-09 07:48:33 +01:00
muppeth added 1 commit 2024-03-21 17:39:21 +01:00
muppeth merged commit 57cfc4d442 into main 2024-03-21 17:39:47 +01:00
muppeth referenced this issue from a commit 2024-03-21 17:39:47 +01:00
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No project
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Disroot-Ansible/nginx#65
No description provided.