aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nixops/modules/pub/default.nix10
-rw-r--r--nixops/modules/pub/restrict1
2 files changed, 10 insertions, 1 deletions
diff --git a/nixops/modules/pub/default.nix b/nixops/modules/pub/default.nix
index 59263ad..f566e69 100644
--- a/nixops/modules/pub/default.nix
+++ b/nixops/modules/pub/default.nix
@@ -24,6 +24,14 @@
24 --prefix PATH : ${lib.makeBinPath [ pkgs.bubblewrap pkgs.rrsync ]} \ 24 --prefix PATH : ${lib.makeBinPath [ pkgs.bubblewrap pkgs.rrsync ]} \
25 --set TMUX_RESTRICT ${./tmux.restrict.conf} 25 --set TMUX_RESTRICT ${./tmux.restrict.conf}
26 ''; 26 '';
27 purple-hangouts = pkgs.purple-hangouts.overrideAttrs(old: {
28 installPhase = ''
29 install -Dm755 -t $out/lib/purple-2/ libhangouts.so
30 for size in 16 22 24 48; do
31 install -TDm644 hangouts$size.png $out/share/pixmaps/pidgin/protocols/$size/hangouts.png
32 done
33 '';
34 });
27 in { 35 in {
28 createHome = true; 36 createHome = true;
29 description = "Restricted shell user"; 37 description = "Restricted shell user";
@@ -34,7 +42,7 @@
34 restrict 42 restrict
35 pkgs.tmux 43 pkgs.tmux
36 (pkgs.pidgin.override { plugins = [ 44 (pkgs.pidgin.override { plugins = [
37 pkgs.purple-plugin-pack pkgs.purple-hangouts 45 pkgs.purple-plugin-pack purple-hangouts
38 pkgs.purple-discord pkgs.purple-facebook 46 pkgs.purple-discord pkgs.purple-facebook
39 pkgs.telegram-purple 47 pkgs.telegram-purple
40 ]; }) 48 ]; })
diff --git a/nixops/modules/pub/restrict b/nixops/modules/pub/restrict
index a16d7a5..6d80590 100644
--- a/nixops/modules/pub/restrict
+++ b/nixops/modules/pub/restrict
@@ -34,6 +34,7 @@ rsync*)
34 --proc /proc \ 34 --proc /proc \
35 --dev /dev \ 35 --dev /dev \
36 --ro-bind /etc/resolv.conf /etc/resolv.conf \ 36 --ro-bind /etc/resolv.conf /etc/resolv.conf \
37 --ro-bind /etc/zoneinfo /etc/zoneinfo \
37 --ro-bind /run/current-system/sw/lib/locale/locale-archive /etc/locale-archive \ 38 --ro-bind /run/current-system/sw/lib/locale/locale-archive /etc/locale-archive \
38 --ro-bind /run/current-system/sw/bin /bin \ 39 --ro-bind /run/current-system/sw/bin /bin \
39 --ro-bind /etc/profiles/per-user/pub/bin /bin-pub \ 40 --ro-bind /etc/profiles/per-user/pub/bin /bin-pub \