diff --git a/BUILD.bazel b/BUILD.bazel index 6494961efd2..a7164142de6 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -76,7 +76,7 @@ pkg_tar( name = "tectonic-%s" % TECTONIC_VERSION, srcs = [ "//:template_resources", - "//examples:tectonic_cli_examples", + "//examples:config_examples", ], extension = "tar.gz", mode = "0666", diff --git a/Documentation/dev/libvirt-howto.md b/Documentation/dev/libvirt-howto.md index 0097724d099..4f2732a132c 100644 --- a/Documentation/dev/libvirt-howto.md +++ b/Documentation/dev/libvirt-howto.md @@ -84,7 +84,7 @@ iptables -I INPUT -p tcp -s 192.168.124.0/24 -d 192.168.124.1 --dport 16509 \ ``` #### 1.7 Prepare the configuration file -1. `cp examples/tectonic.libvirt.yaml ./` +1. `cp examples/libvirt.yaml ./` 1. Edit the configuration file: 1. Set an email and password in the `admin` section 1. Set a `baseDomain` (to `tt.testing`) @@ -132,7 +132,7 @@ alias tectonic="${PWD}/tectonic-dev/installer/tectonic" Initialize (the environment variables are a convenience): ```sh -tectonic init --config=../tectonic.libvirt.yaml +tectonic init --config=../libvirt.yaml export CLUSTER_NAME= export BASE_DOMAIN= ``` diff --git a/README.md b/README.md index 69a8c89a6a3..573af119998 100644 --- a/README.md +++ b/README.md @@ -35,13 +35,13 @@ These instructions can be used for AWS: 5. Edit Tectonic configuration file including the $CLUSTER_NAME ```sh - $EDITOR examples/tectonic.aws.yaml + $EDITOR examples/aws.yaml ``` 6. Prepare a local configuration. The structure behind the YAML input is described [here][godoc-InstallConfig]. ```sh - tectonic init --config=examples/tectonic.aws.yaml + tectonic init --config=examples/aws.yaml ``` 7. Install Tectonic cluster @@ -51,7 +51,7 @@ These instructions can be used for AWS: 8. Visit `https://{$CLUSTER_NAME}-api.${BASE_DOMAIN}:6443/console/`. You may need to ignore a certificate warning if you did not configure a CA known to your browser. - Log in with the admin credentials you configured in `tectonic.aws.yaml`. + Log in with the admin credentials you configured in `aws.yaml`. 9. Teardown Tectonic cluster ```sh diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel index 33b91ac6a78..37baf66af6a 100644 --- a/examples/BUILD.bazel +++ b/examples/BUILD.bazel @@ -1,9 +1,9 @@ -example_cli_configs = glob(["tectonic.*.yaml"]) +config_examples = glob(["*.yaml"]) filegroup( - name = "tectonic_cli_examples", - srcs = example_cli_configs, + name = "config_examples", + srcs = config_examples, visibility = ["//visibility:public"], ) -exports_files(example_cli_configs) +exports_files(config_examples) diff --git a/examples/tectonic.aws.yaml b/examples/aws.yaml similarity index 100% rename from examples/tectonic.aws.yaml rename to examples/aws.yaml diff --git a/examples/tectonic.libvirt.yaml b/examples/libvirt.yaml similarity index 100% rename from examples/tectonic.libvirt.yaml rename to examples/libvirt.yaml diff --git a/tests/run.sh b/tests/run.sh index 1a51e03d8c3..0c8b496d4a4 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -82,7 +82,7 @@ python <<-EOF >"${CLUSTER_NAME}.yaml" import yaml - with open('examples/tectonic.${BACKEND}.yaml') as f: + with open('examples/${BACKEND}.yaml') as f: config = yaml.load(f) config['name'] = '${CLUSTER_NAME}' with open(os.path.expanduser(os.path.join('~', '.ssh', 'id_rsa.pub'))) as f: