more tidying and fix frontend build
This commit is contained in:
parent
ac7393b9e6
commit
e42f4c212b
|
@ -33,7 +33,7 @@
|
|||
// utils.lib.eachSystem (utils.lib.defaultSystems) (system: let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [self.overlay];
|
||||
overlays = [self.overlays.default];
|
||||
};
|
||||
in {
|
||||
packages = {
|
||||
|
|
|
@ -3,9 +3,11 @@
|
|||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (lib.modules) mkIf;
|
||||
|
||||
cfg = config.services.piped;
|
||||
in {
|
||||
config = lib.mkIf (cfg.enable && !cfg.disableNginx) {
|
||||
config = mkIf (cfg.enable && !cfg.disableNginx) {
|
||||
services.nginx.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3,8 +3,9 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
}: let
|
||||
inherit (lib.modules) mkIf;
|
||||
|
||||
cfg = config.services.piped;
|
||||
in {
|
||||
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;
|
||||
enableACME = cfg.nginxEnableACME;
|
||||
locations."/" = {
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -27,7 +27,8 @@ if [ "$new_frontend_rev" != "$old_frontend_rev" ] || [ "${FORCE_UPDATE-}" != ""
|
|||
pushd Piped
|
||||
git reset --hard "$new_frontend_rev"
|
||||
#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"
|
||||
cp yarn.lock "${BASE_DIR}/packages/frontend/yarn.lock"
|
||||
popd
|
||||
|
@ -35,6 +36,8 @@ if [ "$new_frontend_rev" != "$old_frontend_rev" ] || [ "${FORCE_UPDATE-}" != ""
|
|||
rm -rf "$TMP"
|
||||
fi
|
||||
|
||||
exit
|
||||
|
||||
# Backend
|
||||
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)
|
||||
|
|
Loading…
Reference in a new issue