Permalink
Browse files

Misc. renames

  • Loading branch information...
1 parent 1cdb138 commit 39516f91a31fc321b06046e56acb509af68e0fa6 @edolstra edolstra committed May 2, 2013
View
@@ -3,7 +3,7 @@
examples/*.json
examples/*.lock
result
-tests/test.charon*
+tests/test.nixops*
.coverage
coverage.xml
html/
View
@@ -1,7 +1,7 @@
-Charon
+NixOps
====
-Charon is a tool for deploying NixOS machines in a network or cloud.
+NixOps is a tool for deploying NixOS machines in a network or cloud.
* [Manual](http://hydra.nixos.org/job/charon/master/build/latest/download/2/charon/manual.html)
* [Installation instructions](http://hydra.nixos.org/job/charon/master/build/latest/download/2/charon/manual.html#chap-installation)
View
@@ -6,4 +6,4 @@
assert os.getenv("EC2_SECURITY_GROUP") is not None, "The EC2_SECURITY_GROUP env var must be set to the name of an ec2 security group with inbound ssh access"
assert os.getenv("EC2_KEY_PAIR") is not None, "The EC2_KEY_PAIR env var must be set to the name of an ec2 keypair"
assert os.getenv("EC2_PRIVATE_KEY_FILE") is not None, "The EC2_PRIVATE_KEY_FILE env var must be set to the private key of an ec2 keypair"
- nose.main(argv=[ sys.argv[0], "--with-xunit", "--with-coverage", "--cover-inclusive", "--cover-xml", "--cover-xml-file=coverage.xml", "--cover-html", "--cover-html-dir=./html", "--cover-package=charon", "-e", "^tests\.py$" ])
+ nose.main(argv=[ sys.argv[0], "--with-xunit", "--with-coverage", "--cover-inclusive", "--cover-xml", "--cover-xml-file=coverage.xml", "--cover-html", "--cover-html-dir=./html", "--cover-package=nixops", "-e", "^tests\.py$" ])
View
@@ -60,12 +60,12 @@ cloud.</para>
<listitem><para>Path to the state file that contains the
deployments. It defaults to the value of the
<envar>NIXOPS_STATE</envar> environment variable, or
- <filename>~/.charon/deployments.charon</filename> if that one is
- not defined. It must have extension <literal>.charon</literal>.
+ <filename>~/.nixops/deployments.nixops</filename> if that one is
+ not defined. It must have extension <literal>.nixops</literal>.
The state file is actually a SQLite database that can be inspected
using the <command>sqlite3</command> command (for example,
- <literal>sqlite3 network.charon .dump</literal>). If it does not
- exist, it is created automatically.</para></listitem>
+ <literal>sqlite3 deployments.nixops .dump</literal>). If it does
+ not exist, it is created automatically.</para></listitem>
</varlistentry>
@@ -122,7 +122,7 @@ cloud.</para>
<listitem><para>The location of the state file if
<option>--state</option> is not used. It defaults to
- <filename>./network.charon</filename>.</para></listitem>
+ <filename>~/.nixops/deployments.nixops</filename>.</para></listitem>
</varlistentry>
@@ -24,10 +24,10 @@
ec2.size = 1;
ec2.encrypt = true;
# You can specify a passphrase (encryption key), or let
- # Charon generate one. It's stored on the root volume of
+ # NixOps generate one. It's stored on the root volume of
# the instance, unless you set the option
# ‘deployment.storeKeysOnMachine’. In that case, unattended
- # reboots will block until you run the command ‘charon
+ # reboots will block until you run the command ‘nixops
# send-keys’.
#ec2.passphrase = "fubar";
};
View
@@ -54,7 +54,7 @@ with utils;
the volume. If left empty, a passphrase is generated
automatically; this passphrase is lost when you destroy the
machine or underlying device, unless you copy it from
- Charon's state file. Note that unless
+ NixOps's state file. Note that unless
<option>deployment.storeKeysOnMachine</option> is set to
<literal>false</literal>, the passphrase is stored in the
Nix store of the instance, so an attacker who gains access
View
@@ -85,7 +85,7 @@ let
the device. If left empty, a passphrase is generated
automatically; this passphrase is lost when you destroy the
machine or remove the volume, unless you copy it from
- Charon's state file. Note that the passphrase is stored in
+ NixOps's state file. Note that the passphrase is stored in
the Nix store of the instance, so an attacker who gains
access to the EBS volume or instance store that contains the
Nix store can subsequently decrypt the encrypted volume.
@@ -263,7 +263,7 @@ in
type = types.uniq types.string;
description = ''
Path of the SSH private key file corresponding with
- <option>deployment.ec2.keyPair</option>. Charon will use this
+ <option>deployment.ec2.keyPair</option>. NixOps will use this
private key if set; otherwise, the key must be findable by SSH
through its normal mechanisms (e.g. it should be listed in
<filename>~/.ssh/config</filename> or added to the
View
@@ -29,7 +29,7 @@ in
type = types.uniq types.string;
description = ''
This option specifies the type of the environment in which the
- machine is to be deployed by Charon. Currently, it can have
+ machine is to be deployed by NixOps. Currently, it can have
the following values. <literal>"none"</literal> means
deploying to a pre-existing physical or virtual NixOS machine,
reachable via SSH under the hostname or IP address specified
@@ -43,26 +43,26 @@ in
means that a virtual machine should be instantiated by
executing certain commands via SSH on a cloud controller
machine (see <option>deployment.adhoc.*</option>). This is
- primarily useful for debugging Charon.
+ primarily useful for debugging NixOps.
'';
};
deployment.targetHost = mkOption {
type = types.uniq types.string;
description = ''
This option specifies the hostname or IP address to be used by
- Charon to execute remote deployment operations.
+ NixOps to execute remote deployment operations.
'';
};
deployment.encryptedLinksTo = mkOption {
default = [];
type = types.list types.string;
description = ''
- Charon will set up an encrypted tunnel (via SSH) to the
+ NixOps will set up an encrypted tunnel (via SSH) to the
machines listed here. Since this is a two-way (peer to peer)
connection, it is not necessary to set this option on both
- endpoints. Charon will set up <filename>/etc/hosts</filename>
+ endpoints. NixOps will set up <filename>/etc/hosts</filename>
so that the host names of the machines listed here resolve to
the IP addresses of the tunnels. It will also add the alias
<literal><replaceable>machine</replaceable>-encrypted</literal>
@@ -77,7 +77,7 @@ in
example = "cloud.example.org";
type = types.uniq types.string;
description = ''
- Hostname or IP addres of the machine to which Charon should
+ Hostname or IP addres of the machine to which NixOps should
connect (via SSH) to execute commands to start VMs or query
their status.
'';
View
@@ -25,7 +25,7 @@ with pkgs.lib;
arn = mkOption {
default = "arn:aws:s3:::${config.name}"; # FIXME: don't set a default
type = types.uniq types.string;
- description = "Amazon Resource Name (ARN) of the S3 bucket. This is set by Charon.";
+ description = "Amazon Resource Name (ARN) of the S3 bucket. This is set by NixOps.";
};
};
View
@@ -35,13 +35,13 @@ with pkgs.lib;
url = mkOption {
default = ""; # FIXME: don't set a default
type = types.uniq types.string;
- description = "URL of the queue. This is set by Charon.";
+ description = "URL of the queue. This is set by NixOps.";
};
arn = mkOption {
default = ""; # FIXME: don't set a default
type = types.uniq types.string;
- description = "Amazon Resource Name (ARN) of the queue. This is set by Charon.";
+ description = "Amazon Resource Name (ARN) of the queue. This is set by NixOps.";
};
};
@@ -159,7 +159,7 @@ def create(self, defn, check, allow_reboot, allow_recreate):
if not self.vm_id:
self.log("creating VirtualBox VM...")
- vm_id = "charon-{0}-{1}".format(self.depl.uuid, self.name)
+ vm_id = "nixops-{0}-{1}".format(self.depl.uuid, self.name)
self._logged_exec(["VBoxManage", "createvm", "--name", vm_id, "--ostype", "Linux", "--register"])
self.vm_id = vm_id
self.state = self.STOPPED
View
@@ -90,7 +90,7 @@ def abs_nix_path(x):
undefined = object()
def attr_property(name, default, type=str):
- """Define a property that corresponds to a value in the Charon state file."""
+ """Define a property that corresponds to a value in the NixOps state file."""
def get(self):
s = self._get_attr(name, default)
if s == undefined:
@@ -109,8 +109,8 @@ def set(self, x):
return property(get, set)
-def create_key_pair(key_name="Charon auto-generated key", type="dsa"):
- key_dir = tempfile.mkdtemp(prefix="charon-tmp")
+def create_key_pair(key_name="NixOps auto-generated key", type="dsa"):
+ key_dir = tempfile.mkdtemp(prefix="nixops-tmp")
res = subprocess.call(["ssh-keygen", "-t", type, "-f", key_dir + "/key", "-N", '', "-C", key_name],
stdout=devnull)
if res != 0: raise Exception("unable to generate an SSH key")
View
@@ -6,7 +6,7 @@
_multiprocess_shared_ = True
-db_file = '%s/test.charon' % (path.dirname(__file__))
+db_file = '%s/test.nixops' % (path.dirname(__file__))
def setup():
deployment.open_database(db_file).close()
@@ -1,5 +1,5 @@
{
- network.description = "Charon Test";
+ network.description = "NixOps Test";
machine = {};
}

0 comments on commit 39516f9

Please sign in to comment.