servnest/servnest-mkosi
1
0
Fork 0
Code Issues Pull requests Releases Activity

Fix tests

Browse source
This commit is contained in:
Miraty 2023-04-20 11:32:57 +02:00
parent 2539320713
commit e9cbabfbaf
7 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
etc/hosts
View file

@ -1,2 +1,8 @@
::1 servnest.test
127.0.0.1 servnest.test
::1 ns1.servnest.test
::1 ns2.servnest.test
::1 sftp.servnest.test
::1 ht.servnest.test
::1 test1.ht.servnest.test
::1 test2.ht.servnest.test
::1 test3.ht.servnest.test

1
install/apache.sh
View file

@ -33,7 +33,6 @@ if [[ $OS = "debian" ]]; then
sed -i 's#/usr/lib/httpd/modules/#/usr/lib/apache2/modules/#g' /etc/apache2/apache2.conf
sed -i 's#ServerRoot "/etc/httpd"#ServerRoot "/etc/apache2"#' /etc/apache2/apache2.conf
sed -i 's/LoadModule unixd_module/#LoadModule unixd_module/' /etc/apache2/apache2.conf
sed -i 's/LoadModule mpm_event_module/#LoadModule mpm_event_module/' /etc/apache2/apache2.conf
sed -i 's/LoadModule log_config_module/#LoadModule log_config_module/' /etc/apache2/apache2.conf
sed -i 's#/var/log/httpd/#/var/log/apache2/#g' /etc/apache2/apache2.conf

6
install/nginx.sh
View file

@ -3,7 +3,11 @@
# Generate default self-signed TLS key pair
openssl req -subj '/' -new -newkey RSA:3072 -days 3650 -nodes -x509 -keyout /etc/ssl/private/servnest.key -out /etc/ssl/certs/servnest.crt
openssl req -subj '/' -new -newkey RSA:3072 -days 3650 -nodes -x509 -keyout /etc/ssl/private/ht.servnest.test.key -out /etc/ssl/certs/ht.servnest.test.crt
openssl req -subj '/CN=servnest.test' -new -newkey RSA:3072 -days 3650 -nodes -x509 -keyout /etc/ssl/private/servnest.test.key -out /etc/ssl/certs/servnest.test.crt
openssl req -subj '/CN=ht.servnest.test' -new -newkey RSA:3072 -days 3650 -nodes -x509 -keyout /etc/ssl/private/ht.servnest.test.key -out /etc/ssl/certs/ht.servnest.test.crt
openssl req -subj '/CN=*.ht.servnest.test' -new -newkey RSA:3072 -days 3650 -nodes -x509 -keyout /etc/ssl/private/wildcard.ht.servnest.test.key -out /etc/ssl/certs/wildcard.ht.servnest.test.crt
rm -r /etc/nginx/*
cp -r /install/nginx/* /etc/nginx/

4
install/nginx/sites/interface.conf
View file

@ -32,8 +32,8 @@ server {
access_log /var/log/nginx/servnest-access.log servnest if=$loggable;
# For a public server, these should point to a Let's Encrypt-trusted key pair
ssl_certificate /etc/ssl/certs/servnest.crt;
ssl_certificate_key /etc/ssl/private/servnest.key;
ssl_certificate /etc/ssl/certs/servnest.test.crt;
ssl_certificate_key /etc/ssl/private/servnest.test.key;
}
map $request_method $loggable { # Log only POST requests
"POST" 1;

4
install/nginx/sites/subdomain.conf
View file

@ -5,8 +5,8 @@ server {
listen 127.0.0.1:42443 ssl http2;
server_name *.ht.servnest.test;
ssl_certificate /etc/ssl/certs/ht.servnest.test.crt;
ssl_certificate_key /etc/ssl/private/ht.servnest.test.key;
ssl_certificate /etc/ssl/certs/wildcard.ht.servnest.test.crt;
ssl_certificate_key /etc/ssl/private/wildcard.ht.servnest.test.key;
include inc/proxy.conf;
}

2
mkosi.default.d/debian/mkosi.default
View file

@ -13,6 +13,7 @@ Packages =
libnginx-mod-http-headers-more-filter
python3-certbot-nginx
knot-dnsutils
knot-dnssecutils
php-sqlite3
golang-1.19
openssh-server
@ -20,3 +21,4 @@ Packages =
gettext
php-curl
sshpass
less

3
mkosi.postinst
View file

@ -21,3 +21,6 @@ if [[ $OS = "arch" ]]; then
pacman-key --init
pacman-key --populate
fi
# Enable testing option
sed -i 's/local_only_check = false/local_only_check = true/' /srv/servnest/core/config.ini