From 35e0d8da5629caebcd8b103900705f15412b84cf Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sun, 21 Apr 2019 11:04:42 +0200 Subject: [PATCH 1/6] riot: dimension t2bot --- overlays/riot-web.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/overlays/riot-web.nix b/overlays/riot-web.nix index 74539b1..c92dfa5 100644 --- a/overlays/riot-web.nix +++ b/overlays/riot-web.nix @@ -6,7 +6,11 @@ self: super: "default_hs_url": "https://matrix.nyanlout.re", "default_is_url": "https://vector.im", "brand": "Nyanloutre", - "default_theme": "dark" + "default_theme": "dark", + "integrations_ui_url": "https://dimension.t2bot.io/riot", + "integrations_rest_url": "https://dimension.t2bot.io/api/v1/scalar", + "integrations_widgets_urls": ["https://dimension.t2bot.io/widgets"], + "integrations_jitsi_widget_url": "https://dimension.t2bot.io/widgets/jitsi" } ''; }; From d9c00135027cf654e8e082b53ac21bd896d22446 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sun, 21 Apr 2019 11:05:45 +0200 Subject: [PATCH 2/6] nat: config de test --- systems/LoutreOS/configuration.nix | 37 ++++-------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index 6415262..25a7fdb 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -42,20 +42,13 @@ in # eno1 -> VLAN100 -> Internet # eno2 -> LAN - # eno3 -> accès serveur - # eno4 -> Wifi ? + # eno3 -> Legacy client DHCP + # eno4 -> Pas utilisé networking = { hostName = "loutreos"; # Define your hostname. hostId = "7e66e347"; - # firewall.trustedInterfaces = [ "eno3" ]; - # interface.eno3 = { - # ipv4.addresses = [ - # { address = "10.30.0.5"; prefixLength = 24; } - # ]; - # }; - vlans.bouyges = { id = 100; interface = "eno1"; @@ -76,32 +69,10 @@ in # NAT bouyges <-> eno2 nat = { enable = true; - externalInterface = "bouyges"; + # À remplacer par bouyges + externalInterface = "eno3"; # Permet d'utiliser le SNAT plus rapide au lieu de MASQUERADE # externalIP = "0.0.0.0"; - forwardPorts = [ - # FTP - { destination = "10.30.0.5"; proto = "tcp"; sourcePort = 20; } - { destination = "10.30.0.5"; proto = "tcp"; sourcePort = 21; } - { destination = "10.30.0.5"; proto = "tcp"; sourcePort = "64000:65535"; } - # SSH - { destination = "10.30.0.5"; proto = "tcp"; sourcePort = 22; } - # Mails - { destination = "10.30.0.5"; proto = "tcp"; sourcePort = 25; } - { destination = "10.30.0.5"; proto = "tcp"; sourcePort = 143; } - { destination = "10.30.0.5"; proto = "tcp"; sourcePort = 587; } - { destination = "10.30.0.5"; proto = "tcp"; sourcePort = 4190; } - # HAProxy - { destination = "10.30.0.5"; proto = "tcp"; sourcePort = 80; } - { destination = "10.30.0.5"; proto = "tcp"; sourcePort = 443; } - # Matrix - { destination = "10.30.0.5"; proto = "tcp"; sourcePort = 8448; } - # Syncthing - { destination = "10.30.0.5"; proto = "tcp"; sourcePort = 22000; } - # Transmission - { destination = "10.30.0.5"; proto = "tcp"; sourcePort = 51413; } - { destination = "10.30.0.5"; proto = "udp"; sourcePort = 51413; } - ]; internalIPs = [ "10.30.0.0/16" ]; internalInterfaces = [ "eno2" ]; }; From 74e9983200784ab2b0e2d83bcce30331e0dc68ed Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 26 Mar 2019 11:22:08 +0100 Subject: [PATCH 3/6] update --- systems/LoutreOS/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index 25a7fdb..907b12f 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -5,7 +5,7 @@ { config, pkgs, ... }: let - gitRev = "afca3f977175280668aaed92112eb42a171510d2"; + gitRev = "83dbfc9fc8fab023f21743c13bb0f42287a5eb50"; nixpkgs = fetchTarball "https://github.com/nyanloutre/nixpkgs/archive/${gitRev}.tar.gz"; in { From 34ea855049b7e4636f1911ee417789d8257520c4 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 27 Feb 2019 15:06:57 +0100 Subject: [PATCH 4/6] =?UTF-8?q?vsftpd:=20fix=2019.03=20->=20SSL=20activ?= =?UTF-8?q?=C3=A9=20par=20d=C3=A9faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- containers/vsftpd.nix | 3 --- overlays/vsftpd.nix | 6 ------ 2 files changed, 9 deletions(-) delete mode 100644 overlays/vsftpd.nix diff --git a/containers/vsftpd.nix b/containers/vsftpd.nix index 02fab55..77fceae 100644 --- a/containers/vsftpd.nix +++ b/containers/vsftpd.nix @@ -5,9 +5,6 @@ config = { config, pkgs, ... }: { - nixpkgs.overlays = [ - (import ../overlays/vsftpd.nix) - ]; services.vsftpd = { enable = true; forceLocalLoginsSSL = true; diff --git a/overlays/vsftpd.nix b/overlays/vsftpd.nix deleted file mode 100644 index 9475490..0000000 --- a/overlays/vsftpd.nix +++ /dev/null @@ -1,6 +0,0 @@ -self: super: -{ - vsftpd = super.vsftpd.override { - sslEnable = true; - }; -} From ad7cf6495926609856698314c0935e24f1ab5cd6 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 26 Mar 2019 11:23:48 +0100 Subject: [PATCH 5/6] update 19.03 --- systems/LoutreOS/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index 907b12f..a6d4124 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -5,7 +5,7 @@ { config, pkgs, ... }: let - gitRev = "83dbfc9fc8fab023f21743c13bb0f42287a5eb50"; + gitRev = "91cb80e4397d55b19b0beba3fa3846f1a02d0342"; nixpkgs = fetchTarball "https://github.com/nyanloutre/nixpkgs/archive/${gitRev}.tar.gz"; in { From 414be4c06a6422b95fe266e6203c038f61d7f5ef Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 26 Apr 2019 00:04:44 +0200 Subject: [PATCH 6/6] pr-autobot: migration 18.09 -> 19.03 --- services/auto-pr.nix | 2 +- services/pr-autobot.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/auto-pr.nix b/services/auto-pr.nix index 0ac765c..228f7a9 100644 --- a/services/auto-pr.nix +++ b/services/auto-pr.nix @@ -27,7 +27,7 @@ in ignoreCollisions = true; }; in "${pkgs.writeShellScriptBin "run.sh" '' - ${env}/bin/python ${pkgs.writeScript "pr-autobot.py" "${readFile ./pr-autobot.py}"} --private-key /var/lib/auto-pr-bot/private-key.pem --app-id 19565 --installation-id 407088 --repo nyanloutre/nixpkgs --cache-dir /var/cache/auto-pr-bot + ${env}/bin/python ${pkgs.writeScript "pr-autobot.py" "${readFile ./pr-autobot.py}"} --private-key /var/lib/auto-pr-bot/private-key.pem --app-id 19565 --installation-id 407088 --repo nyanloutre/nixpkgs --cache-dir /var/cache/auto-pr-bot --version 19.03 ''}/bin/run.sh"; }; }; diff --git a/services/pr-autobot.py b/services/pr-autobot.py index a1ad4b1..c97a2c9 100755 --- a/services/pr-autobot.py +++ b/services/pr-autobot.py @@ -11,9 +11,10 @@ parser.add_argument('--app-id') parser.add_argument('--installation-id') parser.add_argument('--repo') parser.add_argument('--cache-dir') +parser.add_argument('--version') args = vars(parser.parse_args()) -channel_req = urllib.request.Request(url='https://nixos.org/channels/nixos-18.09/git-revision') +channel_req = urllib.request.Request(url='https://nixos.org/channels/nixos-' + args["version"] + '/git-revision') latest_commit = urllib.request.urlopen(channel_req).read().decode('utf-8') try: previous_commit = open(args['cache_dir'] + '/git-revision', 'r').read() @@ -57,7 +58,7 @@ if latest_commit != previous_commit: - [ ] Fusionner la branche """) - pr = repo.create_pull(title=branch, body=pr_message, base='nixos-18.09', head=branch) + pr = repo.create_pull(title=branch, body=pr_message, base='nixos-' + args["version"], head=branch) print("Pull request numéro " + str(pr.number) + " créée") print("URL : " + pr.html_url)