Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the SSL config for the yunohost.org domain #1969

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix the SSL config for the yunohost.org domain #1969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/yunoprompt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Fetch x509 fingerprint
x509_fingerprint=$(openssl x509 -in /etc/yunohost/certs/yunohost.org/crt.pem -noout -fingerprint -sha256 | cut -d= -f2)
x509_fingerprint=$(openssl x509 -in /etc/yunohost/certs/yunohost/crt.pem -noout -fingerprint -sha256 | cut -d= -f2)


# Fetch SSH fingerprints
Expand Down
4 changes: 2 additions & 2 deletions conf/nginx/yunohost_admin.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ server {

include /etc/nginx/conf.d/security.conf.inc;

ssl_certificate /etc/yunohost/certs/yunohost.org/crt.pem;
ssl_certificate_key /etc/yunohost/certs/yunohost.org/key.pem;
ssl_certificate /etc/yunohost/certs/yunohost/crt.pem;
ssl_certificate_key /etc/yunohost/certs/yunohost/key.pem;

more_set_headers "Strict-Transport-Security : max-age=63072000; includeSubDomains; preload";
more_set_headers "Referrer-Policy : 'same-origin'";
Expand Down
4 changes: 2 additions & 2 deletions conf/slapd/config.ldif
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ olcPidFile: /var/run/slapd/slapd.pid
olcReverseLookup: FALSE
olcThreads: 16
# TLS Support
olcTLSCertificateFile: /etc/yunohost/certs/yunohost.org/crt.pem
olcTLSCertificateKeyFile: /etc/yunohost/certs/yunohost.org/key.pem
olcTLSCertificateFile: /etc/yunohost/certs/yunohost/crt.pem
olcTLSCertificateKeyFile: /etc/yunohost/certs/yunohost/key.pem
olcTLSVerifyClient: never
olcTLSProtocolMin: 0.0
# The tool-threads parameter sets the actual amount of cpu's that is used
Expand Down
8 changes: 4 additions & 4 deletions hooks/conf_regen/02-ssl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ set -e

ssl_dir="/usr/share/yunohost/ssl"
template_dir="/usr/share/yunohost/conf/ssl"
ynh_ca="/etc/yunohost/certs/yunohost.org/ca.pem"
ynh_crt="/etc/yunohost/certs/yunohost.org/crt.pem"
ynh_key="/etc/yunohost/certs/yunohost.org/key.pem"
ynh_ca="/etc/yunohost/certs/yunohost/ca.pem"
ynh_crt="/etc/yunohost/certs/yunohost/crt.pem"
ynh_key="/etc/yunohost/certs/yunohost/key.pem"

regen_local_ca() {

Expand All @@ -15,7 +15,7 @@ regen_local_ca() {
echo -e "\n# Creating local certification authority with domain=$domain\n"

# create certs and SSL directories
mkdir -p "/etc/yunohost/certs/yunohost.org"
mkdir -p "/etc/yunohost/certs/yunohost"
mkdir -p "${ssl_dir}/"{ca,certs,crl,newcerts}

pushd ${ssl_dir}
Expand Down
Loading