Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-04-01 09:40:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed little issues with polr

Browse source
This commit is contained in:
Julien Malka 2022-08-16 10:58:56 +02:00
parent 690490282b
commit 3d6f3e3a10
Signed by: Luj
GPG key ID: 6FC74C847011FD83
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
machines/lisa/default.nix
View file

@ -62,6 +62,7 @@
database = { database = {
createLocally = true; createLocally = true;
dbpassFile = "/root/polrdbpw"; dbpassFile = "/root/polrdbpw";
dbname = "hello";
}; };
config = { config = {
address = "link.julienmalka.me"; address = "link.julienmalka.me";

18
modules/polr/default.nix
View file

@ -211,6 +211,9 @@ with lib;
users.groups."polr" = { }; users.groups."polr" = { };
systemd.tmpfiles.rules = [
"f /var/lib/polr/.env 740 polr polr"
];
systemd.services.polr-config = { systemd.services.polr-config = {
wantedBy = [ "phpfpm-polr.service" ]; wantedBy = [ "phpfpm-polr.service" ];
wants = [ "polr-mysql.service" ]; wants = [ "polr-mysql.service" ];
@ -229,8 +232,7 @@ with lib;
LoadCredential = [ "dbpw:${cfg.database.dbpassFile}" "adminpw:${cfg.adminpassFile}" "appkey:${cfg.config.appkeyFile}" ]; LoadCredential = [ "dbpw:${cfg.database.dbpassFile}" "adminpw:${cfg.adminpassFile}" "appkey:${cfg.config.appkeyFile}" ];
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
BindPaths = [ "/var/lib/polr/:${pkgs.polr}/storage/" ]; BindPaths = [ "/var/lib/polr/:${pkgs.polr}/storage/" "/var/lib/polr/.env:${pkgs.polr}/.env" ];
BindReadOnlyPaths = [ "/var/lib/polr/.env:${pkgs.polr}/.env" ];
ProtectHome = true; ProtectHome = true;
ProtectSystem = "strict"; ProtectSystem = "strict";
PrivateTmp = true; PrivateTmp = true;
@ -247,10 +249,10 @@ with lib;
RemoveIPC = true; RemoveIPC = true;
PrivateMounts = true; PrivateMounts = true;
PrivateNetwork = true; PrivateNetwork = true;
UMask = "0027"; # UMask = "0027";
}; };
script = '' script = ''
${pkgs.rsync}/bin/rsync ${builtins.toFile "env" createEnvFile} /var/lib/polr/.env cp -R ${builtins.toFile "env" createEnvFile} /var/lib/polr/.env
mkdir -p /var/lib/polr/app mkdir -p /var/lib/polr/app
mkdir -p /var/lib/polr/logs mkdir -p /var/lib/polr/logs
mkdir -p /var/lib/polr/framework mkdir -p /var/lib/polr/framework
@ -262,8 +264,11 @@ with lib;
ADMINPW="$(<"$CREDENTIALS_DIRECTORY/adminpw")"; ADMINPW="$(<"$CREDENTIALS_DIRECTORY/adminpw")";
APPKEY="$(<"$CREDENTIALS_DIRECTORY/appkey")"; APPKEY="$(<"$CREDENTIALS_DIRECTORY/appkey")";
APPKEY_ESC=$(printf '%s\n' "$APPKEY" | sed -e 's/[\/&]/\\&/g') APPKEY_ESC=$(printf '%s\n' "$APPKEY" | sed -e 's/[\/&]/\\&/g')
sed -i "s/{DBPASSWORD}/$DBPW_ESC/g" /var/lib/polr/.env sed "s/{DBPASSWORD}/$DBPW_ESC/g" ${pkgs.polr}/.env > /var/lib/polr/tmp
sed -i "s/{APPKEY}/$APPKEY_ESC/g" /var/lib/polr/.env cat /var/lib/polr/tmp > ${pkgs.polr}/.env
sed "s/{APPKEY}/$APPKEY_ESC/g" ${pkgs.polr}/.env > /var/lib/polr/tmp
cat /var/lib/polr/tmp > ${pkgs.polr}/.env
rm /var/lib/polr/tmp
${pkgs.php74}/bin/php ${pkgs.polr}/artisan migrate --force ${pkgs.php74}/bin/php ${pkgs.polr}/artisan migrate --force
${pkgs.php74}/bin/php ${pkgs.polr}/artisan init:createsuperuser $ADMINPW ${pkgs.php74}/bin/php ${pkgs.polr}/artisan init:createsuperuser $ADMINPW
''; '';
@ -290,6 +295,7 @@ with lib;
wantedBy = [ "polr-config.target" ]; wantedBy = [ "polr-config.target" ];
path = [ pkgs.mariadb ]; path = [ pkgs.mariadb ];
serviceConfig = { serviceConfig = {
Type = "oneshot";
LoadCredential = [ "dbpw:${cfg.database.dbpassFile}" ]; LoadCredential = [ "dbpw:${cfg.database.dbpassFile}" ];
User = "mysql"; User = "mysql";
ProtectHome = true; ProtectHome = true;

0
packages/polr/database/ignore Normal file
View file

0
packages/polr/tests/ignore Normal file
View file