coolneng
/
zion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Set up shiori as an alternative to Wallabag" 

This reverts commit 00ac8e6bb2.
This commit is contained in:
coolneng 2020-12-22 15:42:46 +01:00
parent 2227161b31
commit e8953bd3e7
Signed by: coolneng
GPG Key ID: 9893DA236405AF57
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/webstack.nix
View File

@ -86,11 +86,6 @@
forceSSL = true; forceSSL = true;
locations."/" = { proxyPass = "http://localhost:8080/"; }; locations."/" = { proxyPass = "http://localhost:8080/"; };
}; };
"shiori.coolneng.duckdns.org" = {
enableACME = true;
forceSSL = true;
locations."/" = { proxyPass = "http://localhost:8181/"; };
};
}; };
}; };
@ -105,7 +100,6 @@
"sync.coolneng.duckdns.org" "sync.coolneng.duckdns.org"
"git.coolneng.duckdns.org" "git.coolneng.duckdns.org"
"rss.coolneng.duckdns.org" "rss.coolneng.duckdns.org"
"shiori.coolneng.duckdns.org"
]; ];
}; };
}; };
@ -120,7 +114,7 @@
# PostgreSQL databases configuration # PostgreSQL databases configuration
services.postgresql = { services.postgresql = {
enable = true; enable = true;
package = pkgs.postgresql; package = pkgs.postgresql_11;
ensureDatabases = [ "gitea" "wallabag" ]; ensureDatabases = [ "gitea" "wallabag" ];
ensureUsers = [ ensureUsers = [
{ {
@ -162,19 +156,11 @@
}; };
}; };
# Enable shiori service
services.shiori = {
enable = true;
address = "localhost";
port = 8181;
};
# Restart reverse proxy after services startup # Restart reverse proxy after services startup
systemd.services.nginx.after = [ systemd.services.nginx.after = [
"gitea.service" "gitea.service"
"syncthing.service" "syncthing.service"
"miniflux.service" "miniflux.service"
"radicale.service" "radicale.service"
"shiori.service"
]; ];
} }