Browse Source

Merge "Add missing Gemfile to the project"

changes/21/422921/1
Jenkins 3 years ago
parent
commit
9b833810f5
3 changed files with 37 additions and 6 deletions
  1. 31
    0
      Gemfile
  2. 4
    4
      manifests/site.pp
  3. 2
    2
      templates/etherpad-lite_settings.json.erb

+ 31
- 0
Gemfile View File

@@ -0,0 +1,31 @@
1
+source 'https://rubygems.org'
2
+
3
+group :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
+
29
+end
30
+
31
+# vim:ft=ruby

+ 4
- 4
manifests/site.pp View File

@@ -3,14 +3,14 @@
3 3
 class etherpad_lite::site (
4 4
   $database_password,
5 5
   $etherpad_title,
6
-  $sessionKey    = '',
7
-  $dbType        = 'mysql',
6
+  $session_key   = '',
7
+  $db_type       = 'mysql',
8 8
   $database_user = 'eplite',
9 9
   $database_name = 'etherpad-lite',
10 10
   $database_host = 'localhost'
11 11
 ) {
12 12
 
13
-  include etherpad_lite
13
+  include ::etherpad_lite
14 14
 
15 15
   $base = $etherpad_lite::base_install_dir
16 16
 
@@ -39,7 +39,7 @@ class etherpad_lite::site (
39 39
     require => Class['etherpad_lite'],
40 40
   }
41 41
 
42
-  include logrotate
42
+  include ::logrotate
43 43
   logrotate::file { 'epliteerror':
44 44
     log     => "${base}/${etherpad_lite::ep_user}/error.log",
45 45
     options => [

+ 2
- 2
templates/etherpad-lite_settings.json.erb View File

@@ -16,11 +16,11 @@
16 16
 
17 17
   // Session Key, used for reconnecting user sessions
18 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 21
   //The Type of the database. You can choose between dirty, sqlite and mysql
22 22
   //You should use mysql or sqlite for anything else than testing or development
23
-  "dbType" : "<%= @dbType %>",
23
+  "dbType" : "<%= @db_type %>",
24 24
   //the database specific settings
25 25
   "dbSettings" : {
26 26
                    "user"    : "<%= @database_user %>",

Loading…
Cancel
Save