reorg for better sanity

diff --git a/.gitignore b/.gitignore
index 69c74a97794d260e97106d5636a393a50f9406a1..5497b2ca3b7d682f22d0fda2f604c60e5e4c0fc7 100644 (file)
--- 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 (file)
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 1031f14b2cb533564a068b55ad517bac3088f2c1..32eedc6be1a8ac8ff65fac788d41532349777825 100755 (executable)
--- 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 (file)
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 42d7bdf87a07ba99815784f6a38d700a59cfd9b7..269567be31114732d92e93feba053a4c85dc8867 100644 (file)
--- 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