chaos/piped-flake
1
0
Fork 0
Code Issues 1 Activity

more tidying and fix frontend build

Browse source
This commit is contained in:
chaos 2023-09-08 12:01:41 +01:00
parent ac7393b9e6
commit e42f4c212b
No known key found for this signature in database
6 changed files with 1385 additions and 1426 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -33,7 +33,7 @@
// utils.lib.eachSystem (utils.lib.defaultSystems) (system: let // utils.lib.eachSystem (utils.lib.defaultSystems) (system: let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [self.overlay]; overlays = [self.overlays.default];
}; };
in { in {
packages = { packages = {

4
module/nginx.nix
View file

@ -3,9 +3,11 @@
lib, lib,
... ...
}: let }: let
inherit (lib.modules) mkIf;
cfg = config.services.piped; cfg = config.services.piped;
in { in {
config = lib.mkIf (cfg.enable && !cfg.disableNginx) { config = mkIf (cfg.enable && !cfg.disableNginx) {
services.nginx.enable = true; services.nginx.enable = true;
}; };
} }

7
module/proxy.nix
View file

@ -3,8 +3,9 @@
lib, lib,
pkgs, pkgs,
... ...
}: }: let
with lib; let inherit (lib.modules) mkIf;
cfg = config.services.piped; cfg = config.services.piped;
in { in {
config = mkIf (cfg.enable && !cfg.disableProxy) { config = mkIf (cfg.enable && !cfg.disableProxy) {
@ -31,7 +32,7 @@ in {
}; };
}; };
services.nginx.virtualHosts."${cfg.proxyDomain}" = lib.mkIf (!cfg.disableNginx) { services.nginx.virtualHosts."${cfg.proxyDomain}" = mkIf (!cfg.disableNginx) {
forceSSL = cfg.nginxForceSSL; forceSSL = cfg.nginxForceSSL;
enableACME = cfg.nginxEnableACME; enableACME = cfg.nginxEnableACME;
locations."/" = { locations."/" = {

931
packages/frontend/yarn.lock
View file

File diff suppressed because it is too large Load diff

1862
packages/frontend/yarn.nix
View file

File diff suppressed because it is too large Load diff

5
update.sh
View file

@ -27,7 +27,8 @@ if [ "$new_frontend_rev" != "$old_frontend_rev" ] || [ "${FORCE_UPDATE-}" != ""
pushd Piped pushd Piped
git reset --hard "$new_frontend_rev" git reset --hard "$new_frontend_rev"
#yarn install --no-lockfile #yarn install --no-lockfile
yarn install --mode update-lockfile yarn add unocss@0.55.7
yarn install --mode update-lockfile
nix run "github:NixOS/nixpkgs/nixos-unstable#yarn2nix" > "${BASE_DIR}/packages/frontend/yarn.nix" nix run "github:NixOS/nixpkgs/nixos-unstable#yarn2nix" > "${BASE_DIR}/packages/frontend/yarn.nix"
cp yarn.lock "${BASE_DIR}/packages/frontend/yarn.lock" cp yarn.lock "${BASE_DIR}/packages/frontend/yarn.lock"
popd popd
@ -35,6 +36,8 @@ if [ "$new_frontend_rev" != "$old_frontend_rev" ] || [ "${FORCE_UPDATE-}" != ""
rm -rf "$TMP" rm -rf "$TMP"
fi fi
exit
# Backend # Backend
old_backend_rev=$(json_get '.backend.rev') old_backend_rev=$(json_get '.backend.rev')
new_backend_rev=$(curl -L "https://api.github.com/repos/TeamPiped/Piped-Backend/commits" 2>/dev/null | jq ".[0].sha" -r) new_backend_rev=$(curl -L "https://api.github.com/repos/TeamPiped/Piped-Backend/commits" 2>/dev/null | jq ".[0].sha" -r)