From 711d906b1f280c5f8dff90fe3f9ba12500724e4d Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 27 Nov 2013 20:48:07 +0000 Subject: [PATCH] Rename everything into nixbox --- Makefile | 10 +++++----- nixos-template.json.orig => nixbox-template.json.orig | 7 +++++-- nixos32-template.json => nixbox32-template.json | 7 +++++-- nixos64-template.json => nixbox64-template.json | 7 +++++-- 4 files changed, 20 insertions(+), 11 deletions(-) rename nixos-template.json.orig => nixbox-template.json.orig (88%) rename nixos32-template.json => nixbox32-template.json (88%) rename nixos64-template.json => nixbox64-template.json (88%) diff --git a/Makefile b/Makefile index c1922a0..dcac0ac 100644 --- a/Makefile +++ b/Makefile @@ -7,11 +7,11 @@ ISO_URL_64=http://nixos.org/releases/nixos/13.10/nixos-13.10.35455.45219b9/nixos ISO_MD5_64=fbac8c11661028e6f9c4ec293e1329e1 GUEST_OS_64=Linux_64 -all: nixos32-template.json nixos64-template.json +all: nixbox32-template.json nixbox64-template.json -nixos32-template.json: nixos-template.json.orig - cat $< | sed -e 's|ISO_URL|$(ISO_URL_32)|g' -e 's|ISO_MD5|$(ISO_MD5_32)|g' -e 's|GUEST_OS|$(GUEST_OS_32)|g' > $@ +nixbox32-template.json: nixbox-template.json.orig + cat $< | sed -e 's|ISO_URL|$(ISO_URL_32)|g' -e 's|ISO_MD5|$(ISO_MD5_32)|g' -e 's|GUEST_OS|$(GUEST_OS_32)|g' -e 's|NIXBOX|nixbox32|g' > $@ -nixos64-template.json: nixos-template.json.orig - cat $< | sed -e 's|ISO_URL|$(ISO_URL_64)|g' -e 's|ISO_MD5|$(ISO_MD5_64)|g' -e 's|GUEST_OS|$(GUEST_OS_64)|g' > $@ +nixbox64-template.json: nixbox-template.json.orig + cat $< | sed -e 's|ISO_URL|$(ISO_URL_64)|g' -e 's|ISO_MD5|$(ISO_MD5_64)|g' -e 's|GUEST_OS|$(GUEST_OS_64)|g' -e 's|NIXBOX|nixbox64|g' > $@ diff --git a/nixos-template.json.orig b/nixbox-template.json.orig similarity index 88% rename from nixos-template.json.orig rename to nixbox-template.json.orig index ddf44bf..806f3b1 100644 --- a/nixos-template.json.orig +++ b/nixbox-template.json.orig @@ -16,7 +16,7 @@ "mkfs.ext4 -j -L nixos /dev/sda1", "mount LABEL=nixos /mnt", "nixos-generate-config --root /mnt", - "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/configuration.nix > /mnt/etc/nixos/configuration.nix", + "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/configuration.nix | sed -e 's|nixbox|NIXBOX|g' > /mnt/etc/nixos/configuration.nix", "nixos-install && reboot" ], "guest_additions_mode": "disable", @@ -41,7 +41,10 @@ } ], "post-processors": [ - { "type": "vagrant" } + { + "type": "vagrant", + "output": "NIXBOX-{{.Provider}}.box" + } ] } diff --git a/nixos32-template.json b/nixbox32-template.json similarity index 88% rename from nixos32-template.json rename to nixbox32-template.json index 550cffe..6cdaf2c 100644 --- a/nixos32-template.json +++ b/nixbox32-template.json @@ -16,7 +16,7 @@ "mkfs.ext4 -j -L nixos /dev/sda1", "mount LABEL=nixos /mnt", "nixos-generate-config --root /mnt", - "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/configuration.nix > /mnt/etc/nixos/configuration.nix", + "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/configuration.nix | sed -e 's|nixbox|nixbox32|g' > /mnt/etc/nixos/configuration.nix", "nixos-install && reboot" ], "guest_additions_mode": "disable", @@ -41,7 +41,10 @@ } ], "post-processors": [ - { "type": "vagrant" } + { + "type": "vagrant", + "output": "nixbox32-{{.Provider}}.box" + } ] } diff --git a/nixos64-template.json b/nixbox64-template.json similarity index 88% rename from nixos64-template.json rename to nixbox64-template.json index 52c768e..fbd6e96 100644 --- a/nixos64-template.json +++ b/nixbox64-template.json @@ -16,7 +16,7 @@ "mkfs.ext4 -j -L nixos /dev/sda1", "mount LABEL=nixos /mnt", "nixos-generate-config --root /mnt", - "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/configuration.nix > /mnt/etc/nixos/configuration.nix", + "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/configuration.nix | sed -e 's|nixbox|nixbox64|g' > /mnt/etc/nixos/configuration.nix", "nixos-install && reboot" ], "guest_additions_mode": "disable", @@ -41,7 +41,10 @@ } ], "post-processors": [ - { "type": "vagrant" } + { + "type": "vagrant", + "output": "nixbox64-{{.Provider}}.box" + } ] }