From 586afa264c175275c21e28e589c91bd4788b7c04 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 23 Jun 2015 20:58:54 +0000
Subject: [PATCH] Add trystack.o.o into -infra

trystack.org is a simple static site, moving it under -infra
will provide an easy way of maintaining it.

Change-Id: I662769ede97f147f35f63accef7ef1769d7938f0
Depends-On: I96b0d459cb8ffcde42fae751c01f9a3b78760390
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 modules/openstack_project/manifests/static.pp | 18 ++++++++++++++++
 .../templates/trystack.vhost.erb              | 21 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 modules/openstack_project/templates/trystack.vhost.erb

diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp
index 7f9c5736c9..72859fb67c 100644
--- a/modules/openstack_project/manifests/static.pp
+++ b/modules/openstack_project/manifests/static.pp
@@ -228,4 +228,22 @@ class openstack_project::static (
     serveraliases => ['*.devstack.org'],
     template      => 'openstack_project/devstack.vhost.erb',
   }
+
+  ###########################################################
+  # Trystack
+
+  apache::vhost { 'trystack.openstack.org':
+    port     => 80,
+    priority => '50',
+    docroot  => '/opt/trystack',
+    template => 'openstack_project/trystack.vhost.erb',
+    require  => Vcsrepo['/opt/trystack'],
+  }
+
+  vcsrepo { '/opt/trystack':
+    ensure   => latest,
+    provider => git,
+    revision => 'master',
+    source   => 'https://git.openstack.org/openstack-infra/trystack-site',
+  }
 }
diff --git a/modules/openstack_project/templates/trystack.vhost.erb b/modules/openstack_project/templates/trystack.vhost.erb
new file mode 100644
index 0000000000..f9e09793f4
--- /dev/null
+++ b/modules/openstack_project/templates/trystack.vhost.erb
@@ -0,0 +1,21 @@
+# ************************************
+# Managed by Puppet
+# ************************************
+
+NameVirtualHost <%= @vhost_name %>:<%= @port %>
+<VirtualHost <%= @vhost_name %>:<%= @port %>>
+  ServerName <%= @srvname %>
+
+  DocumentRoot <%= @docroot %>
+  <Directory <%= @docroot %>>
+    Options <%= @options %>
+    AllowOverride None
+    Order allow,deny
+    allow from all
+  </Directory>
+
+  ErrorLog /var/log/apache2/<%= @name %>_error.log
+  LogLevel warn
+  CustomLog /var/log/apache2/<%= @name %>_access.log combined
+  ServerSignature Off
+</VirtualHost>