diff --git a/vsroom/Makefile b/vsroom/Makefile deleted file mode 100644 index f009f1f..0000000 --- a/vsroom/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -include $(CURDIR)/../Makefile.inc - -BRANCH = default -SOURCE = https://bitbucket.org/clarifiednetworks/vsroom-internal/get/$(BRANCH).tar.gz -TARGET = vsroom-internal-$(BRANCH)-$(TIMESTAMP).tar.gz - -all: tarball manifest -tarball: $(PACKAGES)/$(TARGET) -manifest: $(MANIFESTS)/vsroom.pp - -$(PACKAGES)/$(TARGET): - @umask 022; echo $@; \ - test -f $@ || curl -f --basic -u $(USER) -o $@ $(SOURCE) - -$(MANIFESTS)/vsroom.pp: $(PACKAGES)/$(TARGET) - @umask 022; echo $@; \ - echo '$$vsroom_package_latest = "$(TARGET)"' > $@ diff --git a/vsroom/files/vsroom-httpd.conf b/vsroom/files/vsroom-httpd.conf deleted file mode 100644 index b74a1ba..0000000 --- a/vsroom/files/vsroom-httpd.conf +++ /dev/null @@ -1,3 +0,0 @@ - - AllowOverride All - diff --git a/vsroom/manifests/init.pp b/vsroom/manifests/init.pp deleted file mode 100644 index 4c2a8ee..0000000 --- a/vsroom/manifests/init.pp +++ /dev/null @@ -1,94 +0,0 @@ -# Install VSRoom. -# -# === Parameters -# -# $authurl: -# Authentication path. Defaults to "/collab/?action=authcredentials". -# -# $boshurl: -# XMPP BOSH path. Defaults to "/bosh/". -# -# $config: -# Source URL of custom config file. -# -# $webhosts: -# List of vsroom virtual hosts. -# -class vsroom( - $authurl="/collab/?action=authcredentials", - $boshurl="/bosh/", - $config=undef, - $webhosts=undef, -) { - - if ! $vsroom_package { - if $::vsroom_package_latest { - $vsroom_package = $::vsroom_package_latest - } else { - fail("Must define \$vsroom_package or \$vsroom_package_latest") - } - } - - file { "/usr/local/src/vsroom.tar.gz": - ensure => present, - mode => "0644", - owner => "root", - group => "root", - source => "puppet:///files/packages/${vsroom_package}", - } - util::extract::tar { "/usr/local/src/vsroom": - ensure => latest, - strip => 1, - source => "/usr/local/src/vsroom.tar.gz", - require => File["/usr/local/src/vsroom.tar.gz"], - } - python::setup::install { "/usr/local/src/vsroom": - require => Util::Extract::Tar["/usr/local/src/vsroom"], - } - - $htdocs = $::operatingsystem ? { - "ubuntu" => "/usr/local/share/vsroom/htdocs", - default => "/usr/share/vsroom/htdocs", - } - - if $config { - $config_content = undef - } else { - $config_content = template("vsroom/config.json.erb") - } - - file { "${htdocs}/config.json": - ensure => present, - mode => "0644", - owner => "root", - group => "root", - source => $config, - content => $config_content, - require => Python::Setup::Install["/usr/local/src/vsroom"], - } - - if $webhosts { - apache::configfile { "vsroom.conf": - http => false, - source => "puppet:///modules/vsroom/vsroom-httpd.conf", - } - - vsroom::configwebhost { $webhosts: - htdocs => $htdocs, - } - } - -} - - -# Enable vsroom for virtual host. -# -define vsroom::configwebhost($htdocs) { - - file { "/srv/www/https/${name}/vsroom": - ensure => link, - target => $htdocs, - require => File["/srv/www/https/${name}"], - } - -} diff --git a/vsroom/templates/config.json.erb b/vsroom/templates/config.json.erb deleted file mode 100644 index 10aa204..0000000 --- a/vsroom/templates/config.json.erb +++ /dev/null @@ -1,4 +0,0 @@ -{ - "authUrl": "<%= @authurl %>", - "boshUrl": "<%= @boshurl %>" -}