tlaternet/tlaternet-server
1
0
Fork 0
Code Issues 9 Pull requests Releases Activity

Compare commits

base: tlaternet:ab5e088016d6576cfb01a9b4d6a842995728a5d5
Branches Tags
tlaternet:master
tlaternet:tlater/with-minecraft
tlaternet:tlater/nixpkgs-formatting
tlaternet:tlater/authelia
..
compare: tlaternet:bb3ffbbd90d9465eeba20b59a32509b9dddcfb03
Branches Tags
tlaternet:tlater/with-minecraft
tlaternet:master
tlaternet:tlater/nixpkgs-formatting
tlaternet:tlater/authelia

No commits in common. "ab5e088016d6576cfb01a9b4d6a842995728a5d5" and "bb3ffbbd90d9465eeba20b59a32509b9dddcfb03" have entirely different histories.
ab5e088016 ... bb3ffbbd90

4 changed files with 54 additions and 70 deletions
Show stats Expand all files Collapse all files

28
configuration/services/conduit.nix
View file

@ -207,28 +207,12 @@ in {
merge_slashes off; merge_slashes off;
''; '';
locations = { locations."/_matrix" = {
"/_matrix" = { proxyPass = "http://${cfg.settings.global.address}:${toString cfg.settings.global.port}";
proxyPass = "http://${cfg.settings.global.address}:${toString cfg.settings.global.port}"; # Recommended by conduit
# Recommended by conduit extraConfig = ''
extraConfig = '' proxy_buffering off;
proxy_buffering off; '';
'';
};
# Add Element X support
# TODO(tlater): Remove when no longer required: https://github.com/vector-im/element-x-android/issues/1085
"=/.well-known/matrix/client" = {
alias = pkgs.writeText "well-known-matrix-client" (builtins.toJSON {
"m.homeserver".base_url = "https://${domain}";
"org.matrix.msc3575.proxy".url = "https://${domain}";
});
extraConfig = ''
default_type application/json;
add_header Access-Control-Allow-Origin "*";
'';
};
}; };
}; };
} }

48
flake.lock
View file

@ -41,11 +41,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1694513707, "lastModified": 1686747123,
"narHash": "sha256-wE5kHco3+FQjc+MwTPwLVqYz4hM7uno2CgXDXUFMCpc=", "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "31c32fb2959103a796e07bbe47e0a5e287c343a8", "rev": "724463b5a94daa810abfc64a4f87faef4e00f984",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -232,11 +232,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1692799911, "lastModified": 1687171271,
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -267,11 +267,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691701569, "lastModified": 1688686059,
"narHash": "sha256-7TK+sO+JC37OGTQDTiz9TriqbB5yTgoo7fyPyLtWvd8=", "narHash": "sha256-1q+xdGil+mVkIMHovLv8bkXvwLjk92X6t0bvTpZVYb0=",
"owner": "reckenrode", "owner": "reckenrode",
"repo": "nix-foundryvtt", "repo": "nix-foundryvtt",
"rev": "3358ccef0ea3e06faabe8c54761fb8a0862b80d4", "rev": "440d3502d17c45d8dfeee5c1833d1ff03525a07b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -361,11 +361,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1693675694, "lastModified": 1690066826,
"narHash": "sha256-2pIOyQwGyy2FtFAUIb8YeKVmOCcPOTVphbAvmshudLE=", "narHash": "sha256-6L2qb+Zc0BFkh72OS9uuX637gniOjzU6qCDBpjB2LGY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5601118d39ca9105f8e7b39d4c221d3388c0419d", "rev": "ce45b591975d070044ca24e3003c830d26fea1c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -377,11 +377,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1694767346, "lastModified": 1690272529,
"narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -408,11 +408,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1694937365, "lastModified": 1690370995,
"narHash": "sha256-iHZSGrb9gVpZRR4B2ishUN/1LRKWtSHZNO37C8z1SmA=", "narHash": "sha256-9z//23jGegLJrf3ITStLwVf715O39dq5u48Kr/XW14U=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5d017a8822e0907fb96f7700a319f9fe2434de02", "rev": "f3fbbc36b4e179a5985b9ab12624e9dfe7989341",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -446,11 +446,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1693539235, "lastModified": 1687440270,
"narHash": "sha256-ACmCq1+RnVq+EB7yeN6fThUR3cCJZb6lKEfv937WG84=", "narHash": "sha256-aOAXvfVn+MBSkU+xlQEiyoGpRaF6NvQdpWIhw5OH/Dc=",
"owner": "berberman", "owner": "berberman",
"repo": "nvfetcher", "repo": "nvfetcher",
"rev": "2bcf73dea96497ac9c36ed320b457caa705f9485", "rev": "44196458acc2c28c32e456c50277d6148e71e708",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -556,11 +556,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1694495315, "lastModified": 1690199016,
"narHash": "sha256-sZEYXs9T1NVHZSSbMqBEtEm2PGa7dEDcx0ttQkArORc=", "narHash": "sha256-yTLL72q6aqGmzHq+C3rDp3rIjno7EJZkFLof6Ika7cE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "ea208e55f8742fdcc0986b256bdfa8986f5e4415", "rev": "c36df4fe4bf4bb87759b1891cab21e7a05219500",
"type": "github" "type": "github"
}, },
"original": { "original": {

24
pkgs/_sources_nextcloud/generated.json
View file

@ -7,11 +7,11 @@
"passthru": null, "passthru": null,
"pinned": false, "pinned": false,
"src": { "src": {
"sha256": "sha256-7baI+vGBg48vZKZY0ikme+4PQl+PLUlC6JE0Air2s5E=", "sha256": "sha256-aflxesvTOdNjPtHRtSPtImdmh4JmzM4s8iF5+lYYo3c=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz" "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.0.1/bookmarks-13.0.1.tar.gz"
}, },
"version": "13.1.1" "version": "13.0.1"
}, },
"calendar": { "calendar": {
"cargoLocks": null, "cargoLocks": null,
@ -21,11 +21,11 @@
"passthru": null, "passthru": null,
"pinned": false, "pinned": false,
"src": { "src": {
"sha256": "sha256-8KwFmnFFlyYzKy2acCCjmpRj2W5pOrbQaPRPm16ZZ7g=", "sha256": "sha256-OAsM65aBJUA8toRSr3/UsdSTq/Rgn43s4nOabqoEoAI=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.0/calendar-v4.5.0.tar.gz" "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.3/calendar-v4.4.3.tar.gz"
}, },
"version": "v4.5.0" "version": "v4.4.3"
}, },
"contacts": { "contacts": {
"cargoLocks": null, "cargoLocks": null,
@ -35,11 +35,11 @@
"passthru": null, "passthru": null,
"pinned": false, "pinned": false,
"src": { "src": {
"sha256": "sha256-dNim0PqUlEGB6J/OTsOjyUZ2JhOBhXC60HhjTstmF4s=", "sha256": "sha256-aG2wD4ioDYXwbyzZBpsEzz0PNvuF95V0JdJNw+kbMzk=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.0/contacts-v5.4.0.tar.gz" "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.2/contacts-v5.3.2.tar.gz"
}, },
"version": "v5.4.0" "version": "v5.3.2"
}, },
"cookbook": { "cookbook": {
"cargoLocks": null, "cargoLocks": null,
@ -63,11 +63,11 @@
"passthru": null, "passthru": null,
"pinned": false, "pinned": false,
"src": { "src": {
"sha256": "sha256-WrLikMN8jxu+vav9Xn8J1wUoGN5wQeQGr5pbVT6GLck=", "sha256": "sha256-hhXPEITSbCiFs0o+TOsQnSasXBpjU9mA/OFsbzuaCPw=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz" "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz"
}, },
"version": "23.0.0" "version": "22.0.0"
}, },
"notes": { "notes": {
"cargoLocks": null, "cargoLocks": null,

24
pkgs/_sources_nextcloud/generated.nix
View file

@ -3,26 +3,26 @@
{ {
bookmarks = { bookmarks = {
pname = "bookmarks"; pname = "bookmarks";
version = "13.1.1"; version = "13.0.1";
src = fetchTarball { src = fetchTarball {
url = "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz"; url = "https://github.com/nextcloud/bookmarks/releases/download/v13.0.1/bookmarks-13.0.1.tar.gz";
sha256 = "sha256-7baI+vGBg48vZKZY0ikme+4PQl+PLUlC6JE0Air2s5E="; sha256 = "sha256-aflxesvTOdNjPtHRtSPtImdmh4JmzM4s8iF5+lYYo3c=";
}; };
}; };
calendar = { calendar = {
pname = "calendar"; pname = "calendar";
version = "v4.5.0"; version = "v4.4.3";
src = fetchTarball { src = fetchTarball {
url = "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.0/calendar-v4.5.0.tar.gz"; url = "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.3/calendar-v4.4.3.tar.gz";
sha256 = "sha256-8KwFmnFFlyYzKy2acCCjmpRj2W5pOrbQaPRPm16ZZ7g="; sha256 = "sha256-OAsM65aBJUA8toRSr3/UsdSTq/Rgn43s4nOabqoEoAI=";
}; };
}; };
contacts = { contacts = {
pname = "contacts"; pname = "contacts";
version = "v5.4.0"; version = "v5.3.2";
src = fetchTarball { src = fetchTarball {
url = "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.0/contacts-v5.4.0.tar.gz"; url = "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.2/contacts-v5.3.2.tar.gz";
sha256 = "sha256-dNim0PqUlEGB6J/OTsOjyUZ2JhOBhXC60HhjTstmF4s="; sha256 = "sha256-aG2wD4ioDYXwbyzZBpsEzz0PNvuF95V0JdJNw+kbMzk=";
}; };
}; };
cookbook = { cookbook = {
@ -35,10 +35,10 @@
}; };
news = { news = {
pname = "news"; pname = "news";
version = "23.0.0"; version = "22.0.0";
src = fetchTarball { src = fetchTarball {
url = "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz"; url = "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz";
sha256 = "sha256-WrLikMN8jxu+vav9Xn8J1wUoGN5wQeQGr5pbVT6GLck="; sha256 = "sha256-hhXPEITSbCiFs0o+TOsQnSasXBpjU9mA/OFsbzuaCPw=";
}; };
}; };
notes = { notes = {