Compare commits
5 Commits
2017-12-23
...
2018-01-05
| Author | SHA1 | Date | |
|---|---|---|---|
| bb08ab258f | |||
| ab183dbc00 | |||
| 62164179ed | |||
| b04e9502f0 | |||
| 4ab0e2ff47 |
8
Makefile
8
Makefile
@@ -1,6 +1,9 @@
|
|||||||
GSF=git submodule foreach
|
GSF=git submodule foreach
|
||||||
TIME=time
|
TIME=time
|
||||||
|
|
||||||
|
CHRONY_STATUS=chronyc tracking
|
||||||
|
CHRONY_STATS=chronyc sources -v
|
||||||
|
|
||||||
all: rebuild-switch
|
all: rebuild-switch
|
||||||
date
|
date
|
||||||
##--------- Commandes spécifiques pour NixOS
|
##--------- Commandes spécifiques pour NixOS
|
||||||
@@ -39,6 +42,11 @@ show-diff-with-current:
|
|||||||
show-roots:
|
show-roots:
|
||||||
nix-store --gc --print-roots
|
nix-store --gc --print-roots
|
||||||
|
|
||||||
|
show-time:
|
||||||
|
-@$(CHRONY_STATUS)
|
||||||
|
#CHRONY_STATUS='chronyc tracking' CHRONY_STATS='chronyc sources -v' ${CHRONY_STATS} && watch -d -n 20 "${CHRONY_STATUS} && echo "--" && ${CHRONY_STATS}"
|
||||||
|
-@watch -d -n 20 "$(CHRONY_STATUS) && echo "--" && $(CHRONY_STATS)"
|
||||||
|
|
||||||
store-repair:
|
store-repair:
|
||||||
$(TIME) nix-store --verify --check-contents --repair
|
$(TIME) nix-store --verify --check-contents --repair
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,11 @@ mkIf flags.developpement {
|
|||||||
|
|
||||||
# Paquets
|
# Paquets
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
# Build / outil de construction
|
||||||
|
autobuild
|
||||||
|
autoconf
|
||||||
|
automake
|
||||||
|
|
||||||
# Base de données
|
# Base de données
|
||||||
pg_top # monitoring de PostgreSQL
|
pg_top # monitoring de PostgreSQL
|
||||||
sqlite # le moteur de base de données
|
sqlite # le moteur de base de données
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ in
|
|||||||
# Host keys the client accepts - order here is honored by OpenSSH
|
# Host keys the client accepts - order here is honored by OpenSSH
|
||||||
HostKeyAlgorithms ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,ssh-rsa,ecdsa-sha2-nistp521-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256
|
HostKeyAlgorithms ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,ssh-rsa,ecdsa-sha2-nistp521-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256
|
||||||
|
|
||||||
KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp256,ecdh-sha2-nistp384,diffie-hellman-group-exchange-sha256
|
KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256
|
||||||
MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
|
MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
|
||||||
Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
|
Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -77,6 +77,11 @@ let
|
|||||||
|
|
||||||
tinc = {
|
tinc = {
|
||||||
enable = mkEnableOption "Enable tinc service";
|
enable = mkEnableOption "Enable tinc service";
|
||||||
|
dnsFQDN = mkOption {
|
||||||
|
example = "device.example.net.";
|
||||||
|
description = "DNS name of host pointing to tunnel IP.";
|
||||||
|
type = lib.types.string;
|
||||||
|
};
|
||||||
connectToAddress = mkOption {
|
connectToAddress = mkOption {
|
||||||
default = "";
|
default = "";
|
||||||
example = "192.168.1.1";
|
example = "192.168.1.1";
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ mkIf flags.hydra-builder {
|
|||||||
docker.enable = true;
|
docker.enable = true;
|
||||||
libvirtd = {
|
libvirtd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableKVM = true;
|
|
||||||
};
|
};
|
||||||
virtualbox = {
|
virtualbox = {
|
||||||
#guest.enable = true;
|
#guest.enable = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user