Compare commits
2 Commits
2016-07-11
...
2016-07-13
| Author | SHA1 | Date | |
|---|---|---|---|
| a920200904 | |||
| 9cce1410a0 |
@@ -56,6 +56,7 @@ in
|
|||||||
isNeoNomade = mkEnableOption "Identification du nom de machine.";
|
isNeoNomade = mkEnableOption "Identification du nom de machine.";
|
||||||
isPhenom = mkEnableOption "Identification du nom de machine.";
|
isPhenom = mkEnableOption "Identification du nom de machine.";
|
||||||
isRadx = mkEnableOption "Identification du nom de machine.";
|
isRadx = mkEnableOption "Identification du nom de machine.";
|
||||||
|
isXray = mkEnableOption "Identification du nom de machine.";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -72,6 +73,7 @@ in
|
|||||||
isNeoNomade = host == "neo-nomade.dubronetwork.fr";
|
isNeoNomade = host == "neo-nomade.dubronetwork.fr";
|
||||||
isPhenom = host == "phenom.dubronetwork.fr";
|
isPhenom = host == "phenom.dubronetwork.fr";
|
||||||
isRadx = host == "radx.prunetwork.fr";
|
isRadx = host == "radx.prunetwork.fr";
|
||||||
|
isXray = host == "xray.prunetwork.fr";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,6 +126,10 @@ in
|
|||||||
virtualbox = true;
|
virtualbox = true;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
(mkIf comp.isXray {
|
||||||
|
r6d.profiles.isPrunetwork = true;
|
||||||
|
r6d.profiles.isServer = true;
|
||||||
|
})
|
||||||
|
|
||||||
(mkIf comp.isLatitude {
|
(mkIf comp.isLatitude {
|
||||||
r6d.profiles.isDubronetwork = true;
|
r6d.profiles.isDubronetwork = true;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# http://www.git-attitude.fr/2014/09/15/30-options-git-qui-gagnent-a-etre-connues/
|
||||||
[color]
|
[color]
|
||||||
diff = auto
|
diff = auto
|
||||||
branch = auto
|
branch = auto
|
||||||
@@ -10,6 +11,7 @@
|
|||||||
ci = commit
|
ci = commit
|
||||||
co = checkout
|
co = checkout
|
||||||
ff = pull --ff-only
|
ff = pull --ff-only
|
||||||
|
oops = commit --amend --no-edit
|
||||||
# Show files ignored by git
|
# Show files ignored by git
|
||||||
ignored = ls-files -o -i --exclude-standard
|
ignored = ls-files -o -i --exclude-standard
|
||||||
ls = ls-files
|
ls = ls-files
|
||||||
|
|||||||
Reference in New Issue
Block a user