From 8dea575cfd10edaadf86c75837445e0bae62e678 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Thu, 28 Nov 2013 15:12:10 -0800 Subject: [PATCH] reorg for better sanity --- .gitignore | 2 +- data.yml | 18 ++++++++++++++++++ launcher | 2 +- data.yml.sample => samples/data.yml | 0 samples/redis.yml | 16 ++++++++++++++++ .../standalone.yml | 0 web_only.yml.sample => samples/web_only.yml | 3 +++ 7 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 data.yml rename data.yml.sample => samples/data.yml (100%) create mode 100644 samples/redis.yml rename standalone.yml.sample => samples/standalone.yml (100%) rename web_only.yml.sample => samples/web_only.yml (85%) diff --git a/.gitignore b/.gitignore index 69c74a9..5497b2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ shared/* *.swp +containers/* cids/* -*.yml diff --git a/data.yml b/data.yml new file mode 100644 index 0000000..966b1a9 --- /dev/null +++ b/data.yml @@ -0,0 +1,18 @@ +templates: + - "templates/cron.template.yml" + - "templates/postgres.template.yml" + - "templates/redis.template.yml" + - "templates/sshd.template.yml" + +expose: + - "5432:5432" + - "6379:6379" + - "2221:22" + +params: + ssh_key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAoW2hxaAVSVNdHQlVJ8eQhhU3m6xYZ5ZsaHaUNc9Gau0OXko7Jw5Gf3ooJ8r0CI0vsHZtifTWCU2t4FlB3ERH6M9Rst8IypOo6/6JrEmXqGBQAHB6QyPNXNE+nVzCdLaww58iQa++IGNS29Zr9jDECGEBh9G52qkBa/9JoOXed6s0JJPf9C5MNNzGbv4mgP8iIqluB41egsY1hTEJwfA1WLgxEEqwZQpEDs2mLZKXlUav3slaD0oq81BZx4WxcKuLv4Xh3mGBeJcM/fWOpQmkgoamFUvD9ijxCQCNrqF0QX/+MqGDxqQfeEzoQaKeINfyehkJpLrcamunBgEvqqlaBw== sam@sam-ubuntu + +volumes: + - volume: + host: /home/sam/discourse_docker/shared + guest: /shared diff --git a/launcher b/launcher index 1031f14..32eedc6 100755 --- a/launcher +++ b/launcher @@ -2,7 +2,7 @@ command=$1 config=$2 -config_file="$config".yml +config_file=containers/"$config".yml cidfile=cids/"$config".cid cidbootstrap=cids/"$config"_boostrap.cid local_discourse=local_discourse diff --git a/data.yml.sample b/samples/data.yml similarity index 100% rename from data.yml.sample rename to samples/data.yml diff --git a/samples/redis.yml b/samples/redis.yml new file mode 100644 index 0000000..571f981 --- /dev/null +++ b/samples/redis.yml @@ -0,0 +1,16 @@ +templates: + - "templates/redis.template.yml" + - "templates/sshd.template.yml" + +expose: + - "6379:6379" + - "2221:22" + +hooks: +# after_sshd: + # - exec: ssh-import-id some-user + +volumes: + - volume: + host: /home/sam/discourse_docker/shared + guest: /shared diff --git a/standalone.yml.sample b/samples/standalone.yml similarity index 100% rename from standalone.yml.sample rename to samples/standalone.yml diff --git a/web_only.yml.sample b/samples/web_only.yml similarity index 85% rename from web_only.yml.sample rename to samples/web_only.yml index 42d7bdf..269567b 100644 --- a/web_only.yml.sample +++ b/samples/web_only.yml @@ -25,6 +25,9 @@ volumes: guest: /shared hooks: +# you may import your key using launchpad if needed +#after_sshd: +# - exec: ssh-import-id some-user after_code: - exec: cd: $home/plugins -- 2.25.1