summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYolanda Robla <yolanda.robla-mota@hp.com>2016-03-11 12:56:39 +0100
committerYolanda Robla <yolanda.robla-mota@hp.com>2016-03-11 13:50:36 +0100
commit939595bedc0733c2baf2e55a0c524ec90e62eb61 (patch)
tree43c02ef13ef8f624ca1f1a7ea39e864dfef50ddd
parent2a78b958c7db758aba4831489c5500953765257b (diff)
Add missing Gemfile to the project
All our puppet projects rely on a Gemfile for tests to run. This was missing, so add here as well. Also fix the linter errors that this new Gemfile addition is causing. Change-Id: I24143df44c313ea76472649bb9a6fa0ce4536307
Notes
Notes (review): Code-Review+1: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com> Code-Review+2: Paul Belanger <pabelanger@redhat.com> Code-Review+2: Colleen Murphy <colleen@gazlene.net> Workflow+1: Colleen Murphy <colleen@gazlene.net> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 18 Mar 2016 00:04:26 +0000 Reviewed-on: https://review.openstack.org/291678 Project: openstack-infra/puppet-ethercalc Branch: refs/heads/master
-rw-r--r--Gemfile31
-rw-r--r--manifests/site.pp8
-rw-r--r--templates/etherpad-lite_settings.json.erb4
3 files changed, 37 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..4497876
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,31 @@
1source 'https://rubygems.org'
2
3group :development, :test do
4 gem 'puppetlabs_spec_helper', :require => false
5
6 gem 'metadata-json-lint'
7 # This is nice and all, but let's not worry about it until we've actually
8 # got puppet 4.x sorted
9 # gem 'puppet-lint-param-docs'
10 gem 'puppet-lint-absolute_classname-check'
11 gem 'puppet-lint-absolute_template_path'
12 gem 'puppet-lint-trailing_newline-check'
13
14 # Puppet 4.x related lint checks
15 gem 'puppet-lint-unquoted_string-check'
16 # Disable it because we use empty string checks
17 #gem 'puppet-lint-empty_string-check'
18 gem 'puppet-lint-leading_zero-check'
19 gem 'puppet-lint-variable_contains_upcase'
20 gem 'puppet-lint-spaceship_operator_without_tag-check'
21 gem 'puppet-lint-undef_in_function-check'
22
23 if puppetversion = ENV['PUPPET_GEM_VERSION']
24 gem 'puppet', puppetversion, :require => false
25 else
26 gem 'puppet', '~> 3.0', :require => false
27 end
28
29end
30
31# vim:ft=ruby
diff --git a/manifests/site.pp b/manifests/site.pp
index fffff00..ca2090d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -3,14 +3,14 @@
3class etherpad_lite::site ( 3class etherpad_lite::site (
4 $database_password, 4 $database_password,
5 $etherpad_title, 5 $etherpad_title,
6 $sessionKey = '', 6 $session_key = '',
7 $dbType = 'mysql', 7 $db_type = 'mysql',
8 $database_user = 'eplite', 8 $database_user = 'eplite',
9 $database_name = 'etherpad-lite', 9 $database_name = 'etherpad-lite',
10 $database_host = 'localhost' 10 $database_host = 'localhost'
11) { 11) {
12 12
13 include etherpad_lite 13 include ::etherpad_lite
14 14
15 $base = $etherpad_lite::base_install_dir 15 $base = $etherpad_lite::base_install_dir
16 16
@@ -39,7 +39,7 @@ class etherpad_lite::site (
39 require => Class['etherpad_lite'], 39 require => Class['etherpad_lite'],
40 } 40 }
41 41
42 include logrotate 42 include ::logrotate
43 logrotate::file { 'epliteerror': 43 logrotate::file { 'epliteerror':
44 log => "${base}/${etherpad_lite::ep_user}/error.log", 44 log => "${base}/${etherpad_lite::ep_user}/error.log",
45 options => [ 45 options => [
diff --git a/templates/etherpad-lite_settings.json.erb b/templates/etherpad-lite_settings.json.erb
index bd5859a..b6572ba 100644
--- a/templates/etherpad-lite_settings.json.erb
+++ b/templates/etherpad-lite_settings.json.erb
@@ -16,11 +16,11 @@
16 16
17 // Session Key, used for reconnecting user sessions 17 // Session Key, used for reconnecting user sessions
18 // Set this to a secure string at least 10 characters long. Do not share this value. 18 // Set this to a secure string at least 10 characters long. Do not share this value.
19 "sessionKey" : "<%= @sessionKey %>", 19 "sessionKey" : "<%= @session_key %>",
20 20
21 //The Type of the database. You can choose between dirty, sqlite and mysql 21 //The Type of the database. You can choose between dirty, sqlite and mysql
22 //You should use mysql or sqlite for anything else than testing or development 22 //You should use mysql or sqlite for anything else than testing or development
23 "dbType" : "<%= @dbType %>", 23 "dbType" : "<%= @db_type %>",
24 //the database specific settings 24 //the database specific settings
25 "dbSettings" : { 25 "dbSettings" : {
26 "user" : "<%= @database_user %>", 26 "user" : "<%= @database_user %>",