From 1b2d597281462f67ecbcbd54b9b98226883bd3fc Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 28 Dec 2011 16:30:21 +0200
Subject: [PATCH] Cleaned up vsroom module

---
 vsroom/files/config.json |  4 +++
 vsroom/files/htaccess    |  4 ---
 vsroom/manifests/init.pp | 55 ++++++++++------------------------------
 3 files changed, 17 insertions(+), 46 deletions(-)
 create mode 100644 vsroom/files/config.json
 delete mode 100644 vsroom/files/htaccess

diff --git a/vsroom/files/config.json b/vsroom/files/config.json
new file mode 100644
index 0000000..4ac2ae1
--- /dev/null
+++ b/vsroom/files/config.json
@@ -0,0 +1,4 @@
+{
+    "authUrl":  "../common/auth_credentials.php",
+    "boshUrl": "/bosh/"
+}
diff --git a/vsroom/files/htaccess b/vsroom/files/htaccess
deleted file mode 100644
index 8b1c0a2..0000000
--- a/vsroom/files/htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-AuthType Basic
-AuthName "VSRoom"
-AuthUserFile /var/lib/vsroom/.htpasswd
-Require valid-user
diff --git a/vsroom/manifests/init.pp b/vsroom/manifests/init.pp
index a922388..ae55ba0 100644
--- a/vsroom/manifests/init.pp
+++ b/vsroom/manifests/init.pp
@@ -33,23 +33,6 @@ class vsroom {
     }
     python::setup::install { "/usr/local/src/vsroom": }
 
-    file { "/usr/local/bin/vsroomctl":
-        ensure  => present,
-        mode    => 0755,
-        owner   => root,
-        group   => root,
-        source  => "/usr/local/src/vsroom/contrib/vsroomctl/vsroomctl",
-        require => Util::Extract::Tar["/usr/local/src/vsroom"],
-    }
-    file { "/usr/local/bin/vsroompasswd":
-        ensure  => present,
-        mode    => 0755,
-        owner   => root,
-        group   => root,
-        source  => "/usr/local/src/vsroom/contrib/vsroompasswd/vsroompasswd",
-        require => Util::Extract::Tar["/usr/local/src/vsroom"],
-    }
-
     include user::system
     realize(User["vsroom"], Group["vsroom"])
 
@@ -83,47 +66,35 @@ class vsroom {
         require => File["/var/lib/vsroom"],
     }
 
-    file { "/var/www/vsroom":
-        ensure => directory,
-        mode   => 0755,
-        owner  => "root",
-        group  => "root",
+    $htdocs = $operatingsystem ? {
+        "ubuntu" => "/usr/local/share/vsroom/htdocs",
+        default  => "/usr/share/vsroom/htdocs",
     }
 
-    file { "/var/www/vsroom/.htaccess":
+    file { "${htdocs}/config.json":
         ensure  => present,
         mode    => 0644,
         owner   => "root",
         group   => "root",
-        source  => "puppet:///modules/vsroom/htaccess",
-        replace => false,
-        require => File["/var/www/vsroom"],
-    }
-
-    file { "/var/www/vsroom/config.json":
-        ensure  => present,
-        mode    => 0644,
-        owner   => "root",
-        group   => "root",
-        content => "{ \"boshUrl\": \"/jabber/http-bind/\" }\n",
-        replace => false,
-        require => File["/var/www/vsroom"],
-    }
-
-    apache::configfile { "vsroom.conf":
-        http   => false,
-        source => "puppet:///modules/vsroom/vsroom-httpd.conf",
+        source  => [ "puppet:///files/vsroom/config.json",
+                     "puppet:///modules/vsroom/config.json", ],
+        require => Python::Setup::Install["/usr/local/src/vsroom"],
     }
 
     define configwebhost() {
         file { "/srv/www/https/${name}/vsroom":
             ensure  => link,
-            target  => "/var/www/vsroom",
+            target  => $htdocs,
             require => File["/srv/www/https/${name}"],
         }
     }
 
     if $vsroom_webhosts {
+        apache::configfile { "vsroom.conf":
+            http   => false,
+            source => "puppet:///modules/vsroom/vsroom-httpd.conf",
+        }
+
         configwebhost { $vsroom_webhosts: }
     }