Compare commits
5 Commits
2017-04-10
...
2017-04-16
| Author | SHA1 | Date | |
|---|---|---|---|
| c6fc32fbe7 | |||
|
|
42db758638 | ||
|
|
07d8924ecd | ||
|
|
2dc04d849b | ||
| 184de980a5 |
3
Makefile
3
Makefile
@@ -41,6 +41,9 @@ download-sources:
|
|||||||
# https://nixos.org/wiki/Download_all_sources
|
# https://nixos.org/wiki/Download_all_sources
|
||||||
nix-store -r $$(grep -l outputHash $$(nix-store -qR $$(nix-instantiate '<nixpkgs>' -A geeqie) | grep '.drv$$'))
|
nix-store -r $$(grep -l outputHash $$(nix-store -qR $$(nix-instantiate '<nixpkgs>' -A geeqie) | grep '.drv$$'))
|
||||||
|
|
||||||
|
build-iso:
|
||||||
|
nix-build '<nixpkgs/nixos>' -A config.system.build.isoImage -I nixos-config=/etc/nixos/base/iso-image/livecd-minimal.nix
|
||||||
|
|
||||||
##--------- Commandes spécifiques pour GIT
|
##--------- Commandes spécifiques pour GIT
|
||||||
|
|
||||||
push: submodules-push
|
push: submodules-push
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ mkIf cfg.graphical {
|
|||||||
# Paquets
|
# Paquets
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# Gestion de FS
|
# Gestion de FS
|
||||||
parted # Gestion graphique de partitions
|
gparted # Gestion graphique de partitions
|
||||||
unetbootin # création de clefs USB bootables
|
unetbootin # création de clefs USB bootables
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -266,7 +266,7 @@ in
|
|||||||
kibana = true;
|
kibana = true;
|
||||||
nix-serve-client = true;
|
nix-serve-client = true;
|
||||||
nix-serve-server = true;
|
nix-serve-server = true;
|
||||||
rabbitmq = true;
|
#rabbitmq = true;
|
||||||
tincAddress = "192.168.12.3/24";
|
tincAddress = "192.168.12.3/24";
|
||||||
tincExtraConfig = ''
|
tincExtraConfig = ''
|
||||||
ConnectTo = monstre_dubronetwork_fr
|
ConnectTo = monstre_dubronetwork_fr
|
||||||
|
|||||||
7
iso-image/Makefile.installation
Normal file
7
iso-image/Makefile.installation
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
all:
|
||||||
|
nixos-generate-config --root /mnt
|
||||||
|
git config --global user.email "nixos-live@example.org"
|
||||||
|
git config --global user.name "NixOS Live"
|
||||||
|
cd /mnt/etc/nixos && git init . && git add . && git commit -m "initial commit"
|
||||||
|
cd /mnt/etc/nixos && git submodule add http://gogs.prunetwork.fr:80/nixos-config/nixos-template-base.git base
|
||||||
|
cd /mnt/etc/nixos && git submodule add https://gogs.prunetwork.fr/Capgemini-CDS-Arkea/template-nixos.git capgemini-cmb
|
||||||
23
iso-image/configuration.nix
Normal file
23
iso-image/configuration.nix
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
capgemini-cmb/default.nix
|
||||||
|
/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
|
||||||
|
nixos-template-base/base.nix
|
||||||
|
];
|
||||||
|
# Custom name
|
||||||
|
isoImage.isoName = pkgs.lib.mkForce "${config.isoImage.isoBaseName}-capgemini-${config.system.nixosLabel}-${pkgs.stdenv.system}.iso";
|
||||||
|
# Avoid having the terminal flooded by kernel audit messages
|
||||||
|
boot.kernelParams = [ "audit=0" ];
|
||||||
|
|
||||||
|
# Files to copy to the liveCD
|
||||||
|
isoImage.contents = [
|
||||||
|
{
|
||||||
|
source = ./Makefile.installation;
|
||||||
|
target = "/custom/Makefile";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
environment.shellAliases = { nixos-generate-custom-config = "cd /iso/custom/ && make";};
|
||||||
|
networking.hostName = "nixos-livecd.corp.capgemini.com";
|
||||||
|
}
|
||||||
@@ -11,6 +11,6 @@ mkIf cfg.developpement-haskell {
|
|||||||
|
|
||||||
services.hoogle = {
|
services.hoogle = {
|
||||||
enable = true;
|
enable = true;
|
||||||
port = 8888;
|
port = 10080;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,6 +27,12 @@ mkIf true {
|
|||||||
path = with pkgs; [ munin lm_sensors ];
|
path = with pkgs; [ munin lm_sensors ];
|
||||||
serviceConfig.TimeoutStartSec = "3min";
|
serviceConfig.TimeoutStartSec = "3min";
|
||||||
};
|
};
|
||||||
|
users.extraUsers.munin = {
|
||||||
|
#extraGroups = [ "postfix" "root" ];
|
||||||
|
extraGroups = [ "postfix" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
# chmod a+rX -Rv /var/lib/postfix/queue/
|
||||||
|
|
||||||
## Munin server -- generate /var/www/munin
|
## Munin server -- generate /var/www/munin
|
||||||
services.munin-cron = {
|
services.munin-cron = {
|
||||||
|
|||||||
Reference in New Issue
Block a user