removed lingering puppet files
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/616641ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/616641ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/616641ea Branch: refs/pull/35/head Commit: 616641ead62b13623d10164197495b6f211fc3a2 Parents: ebc5f18 Author: Rod Simpson <[email protected]> Authored: Mon Jan 27 16:05:58 2014 -0700 Committer: Rod Simpson <[email protected]> Committed: Mon Jan 27 16:05:58 2014 -0700 ---------------------------------------------------------------------- portal/.puppet/.gitignore | 2 - portal/.puppet/Puppetfile | 3 -- portal/.puppet/Puppetfile.lock | 12 ------ portal/.puppet/bootstrap.sh | 18 --------- portal/.puppet/manifests/main.pp | 49 ------------------------ portal/.puppet/modules/.gitignore | 2 - portal/.puppet/templates/vhost-ssl.conf.erb | 33 ---------------- 7 files changed, 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/616641ea/portal/.puppet/.gitignore ---------------------------------------------------------------------- diff --git a/portal/.puppet/.gitignore b/portal/.puppet/.gitignore deleted file mode 100644 index 0dca211..0000000 --- a/portal/.puppet/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.librarian -.tmp \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/616641ea/portal/.puppet/Puppetfile ---------------------------------------------------------------------- diff --git a/portal/.puppet/Puppetfile b/portal/.puppet/Puppetfile deleted file mode 100644 index ac9c577..0000000 --- a/portal/.puppet/Puppetfile +++ /dev/null @@ -1,3 +0,0 @@ -forge "http://forge.puppetlabs.com"; - -mod "puppetlabs/apache" \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/616641ea/portal/.puppet/Puppetfile.lock ---------------------------------------------------------------------- diff --git a/portal/.puppet/Puppetfile.lock b/portal/.puppet/Puppetfile.lock deleted file mode 100644 index 0f25dd0..0000000 --- a/portal/.puppet/Puppetfile.lock +++ /dev/null @@ -1,12 +0,0 @@ -FORGE - remote: http://forge.puppetlabs.com - specs: - puppetlabs/apache (0.6.0) - puppetlabs/firewall (>= 0.0.4) - puppetlabs/stdlib (>= 2.2.1) - puppetlabs/firewall (0.2.1) - puppetlabs/stdlib (3.2.0) - -DEPENDENCIES - puppetlabs/apache (>= 0) - http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/616641ea/portal/.puppet/bootstrap.sh ---------------------------------------------------------------------- diff --git a/portal/.puppet/bootstrap.sh b/portal/.puppet/bootstrap.sh deleted file mode 100644 index 2b2fb64..0000000 --- a/portal/.puppet/bootstrap.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -BOOTSTRAP_LOCK=/tmp/bootsrap.lock -PUPPET_DIR=/vagrant/.puppet/ - -if [ ! -f $BOOTSTRAP_LOCK ]; then - apt-get update - apt-get install git -y - - if [ `gem query --local | grep librarian-puppet-maestrodev | wc -l` -eq 0 ]; then - gem install librarian-puppet-maestrodev - cd $PUPPET_DIR && librarian-puppet install --clean - fi - - touch $BOOTSTRAP_LOCK -fi - -cd $PUPPET_DIR && librarian-puppet update \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/616641ea/portal/.puppet/manifests/main.pp ---------------------------------------------------------------------- diff --git a/portal/.puppet/manifests/main.pp b/portal/.puppet/manifests/main.pp deleted file mode 100644 index 9f23c27..0000000 --- a/portal/.puppet/manifests/main.pp +++ /dev/null @@ -1,49 +0,0 @@ -$server_name = 'usergrid.dev' -$ssl_path = '/etc/apache2/ssl/' -$key_path = "${ssl_path}${server_name}.key" -$cert_path = "${ssl_path}${server_name}.cert" - -Exec { path => '/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin' } - -package { 'openssl': - ensure => installed -} - -file { $ssl_path: - ensure => directory, - owner => "root", - group => "root" -} - -exec { 'openssl-genrsa': - command => "openssl genrsa -out ${key_path} 2048", - creates => $key_path, - require => File[$ssl_path] -} - -exec { 'openssl-req': - command => "openssl req -new -x509 -key ${key_path} -out ${cert_path} -days 3650 -subj /CN=${server_name}", - creates => $cert_path, - require => Exec['openssl-genrsa'] -} - -class { 'apache': } - -apache::mod { 'env': } - -apache::vhost { $server_name: - port => '443', - docroot => '/vagrant', - template => 'vhost-ssl.conf.erb', - require => Exec['openssl-req'] -} - -package { 'compass': - ensure => present, - provider => gem -} - -package { 'bootstrap-sass': - ensure => '2.0.0', - provider => gem -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/616641ea/portal/.puppet/modules/.gitignore ---------------------------------------------------------------------- diff --git a/portal/.puppet/modules/.gitignore b/portal/.puppet/modules/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/portal/.puppet/modules/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/616641ea/portal/.puppet/templates/vhost-ssl.conf.erb ---------------------------------------------------------------------- diff --git a/portal/.puppet/templates/vhost-ssl.conf.erb b/portal/.puppet/templates/vhost-ssl.conf.erb deleted file mode 100644 index 3eb916c..0000000 --- a/portal/.puppet/templates/vhost-ssl.conf.erb +++ /dev/null @@ -1,33 +0,0 @@ -# ************************************ -# Managed by Puppet -# ************************************ - -NameVirtualHost <%= vhost_name %>:<%= port %> -<VirtualHost <%= vhost_name %>:<%= port %>> - ServerName <%= srvname %> -<% if serveradmin %> - ServerAdmin <%= serveradmin %> -<% end %> -<% if serveraliases.is_a? Array -%> -<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> -<% elsif serveraliases != '' -%> -<%= " ServerAlias #{serveraliases}" %> -<% end -%> - DocumentRoot <%= docroot %> - <Directory <%= docroot %>> - Options <%= options %> - AllowOverride <%= Array(override).join(' ') %> - Order allow,deny - allow from all - </Directory> - ErrorLog <%= logroot %>/<%= name %>_error.log - LogLevel warn - CustomLog <%= logroot %>/<%= name %>_access.log combined - ServerSignature Off - - SSLEngine on - SSLCertificateKeyFile <%= key_path %> - SSLCertificateFile <%= cert_path %> - SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown -</VirtualHost> -
