Compare commits

..

No commits in common. "99cdbdd49c849318192be1551d3cb144851b922f" and "aac445108bbaa9f03037b461d1158620c4f3b6c9" have entirely different histories.

5 changed files with 8 additions and 53 deletions

View file

@ -44,16 +44,4 @@ in
extraGroups = [ "docker" ]; extraGroups = [ "docker" ];
}; };
}; };
services = {
mysql = {
enable = true;
package = pkgs.mariadb;
settings = {
mysqld = {
port = 8000;
};
};
};
};
} }

5
execute.sh Normal file
View file

@ -0,0 +1,5 @@
#!/bin/bash
openssl passwd -6 $1 > dev_user_password.pw
colmena apply

View file

@ -36,11 +36,6 @@ in
enableACME = true; enableACME = true;
extraConfig = '' extraConfig = ''
client_max_body_size 512M; client_max_body_size 512M;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
''; '';
locations."/".proxyPass = "http://localhost:${toString srv.HTTP_PORT}"; locations."/".proxyPass = "http://localhost:${toString srv.HTTP_PORT}";
}; };
@ -56,14 +51,6 @@ in
ROOT_URL = "https://${srv.DOMAIN}"; ROOT_URL = "https://${srv.DOMAIN}";
HTTP_PORT = 3000; HTTP_PORT = 3000;
SSH_PORT = 62; SSH_PORT = 62;
# STATIC_ROOT_PATH = pkgs.runCommand "patch-templates" { } ''
# mkdir -p $out
# ${pkgs.lib.getExe' pkgs.coreutils "cp"} -r ${pkgs.forgejo.data}/* $out
# chmod u+w $out/templates/home.tmpl
# ${pkgs.lib.getExe' pkgs.coreutils "cp"} -f ${./home.tmpl} $out/templates/home.tmpl
# chmod u-w $out/templates/home.tmpl
# '';
}; };
service.DISABLE_REGISTRATION = true; service.DISABLE_REGISTRATION = true;
actions = { actions = {
@ -72,11 +59,9 @@ in
}; };
mailer = { mailer = {
ENABLED = true; ENABLED = true;
PROTOCOL = "smtp"; SMTP_ADDR = "TODO";
SMTP_ADDR = "80.151.91.109"; FROM = "noreply@${srv.DOMAIN}";
SMTP_PORT = 25; USER = "noreply@${srv.DOMAIN}";
FROM = "noreply@ptspaper.de";
USER = "noreply@ptspaper.de";
}; };
}; };
dump = { dump = {
@ -88,8 +73,6 @@ in
}; };
}; };
openssh = { openssh = {
ports = [ 62 ]; ports = [ 62 ];
settings = { settings = {

View file

@ -1,19 +0,0 @@
{{template "base/head" .}}
<div role="main" aria-label="{{if .IsSigned}}{{ctx.Locale.Tr "dashboard"}}{{else}}{{ctx.Locale.Tr "home"}}{{end}}" class="page-content home">
<div class="tw-mb-8 tw-px-8">
<div class="center">
<img class="logo" width="220" height="220" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{ctx.Locale.Tr "logo"}}">
<div class="hero">
<h1 class="ui icon header title">
{{AppDisplayName}}
</h1>
<h2>{{ctx.Locale.Tr "startpage.app_desc"}}</h2>
<!-- <h2>{{ctx.Locale.Tr "startpage.app_desc"}}</h2>
<h2>Das ist der Entwicklungsserver der PTS.</h2>
<h2>Zur PTS-Website geht es <a href="https://www.ptspaper.de/de/">hier</a></h2> -->
</div>
</div>
</div>
{{template "home_forgejo" .}}
</div>
{{template "base/footer" .}}

View file

@ -20,8 +20,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
git git
htop htop
inetutils
msmtp
]; ];
networking.firewall = { networking.firewall = {