diaspora-prosody-config 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40adc978303dcd78192493dcdd63bb63bd6debff
-  data.tar.gz: 333053af4529faffc73f1169cf5f6d573e8c73d6
+  metadata.gz: 51d3827fb7cb49b8541a26121c7815643aa0e89e
+  data.tar.gz: a0ceb0f04f825c91eeab6d0c47c4e130bcf2b285
 SHA512:
-  metadata.gz: 30a6128751b83256ff8855935300a2829d7d0243eca008a965c2caf8bf74192cc1f564b784fd62a64e4fe7b6e67fda21f40bca1ce30715fe61d71a64bb00b33a
-  data.tar.gz: 1139ceca50d3875471b597706d7072bba44b85f29ddb4ae45eb00d36799dc9fe9a31f2ebd996fc065eed191f5945abe208b5a0cd5ce91cda023ae51d5d3165f7
+  metadata.gz: bf3edcf393680f1d7a95730ce453ce711f3d7b9021951e7504e968382402aea6546e47615da393959d81905d919c134f7cfdfac0ac77055fc046b9fe8e5215c7
+  data.tar.gz: da2540715ad90b2124d04efc42cf7883e3d624d32102e96c429e52740bc39eb55dac6bd830d8236ef9317ff8d013808235ef847c99eade8669d06f0bc2b2c506

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    diaspora-prosody-config (0.0.4)
+    diaspora-prosody-config (0.0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -56,11 +56,11 @@ PLATFORMS
 
 DEPENDENCIES
   diaspora-prosody-config!
-  minitest
-  pronto
-  pronto-rubocop
-  rake
-  sqlite3
+  minitest (~> 5.8)
+  pronto (~> 0.6.0)
+  pronto-rubocop (~> 0.6.1)
+  rake (~> 10.5)
+  sqlite3 (~> 1.3)
 
 BUNDLED WITH
    1.10.6

data/diaspora-prosody-config.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name        = 'diaspora-prosody-config'
-  s.version     = '0.0.4'
-  s.summary     = 'A prosody config-wrapper for Diaspora'
-  s.description = 'A prosody config-wrapper for Diaspora'
+  s.version     = '0.0.5'
+  s.summary     = 'Diaspora Configuration Wrapper For Prosodoy'
+  s.description = 'This gem maps configuration options from Diaspora to Prosody.'
   s.license     = 'GPL-3.0'
 
   s.authors     = ['Lukas Matt']
@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'pronto'
-  s.add_development_dependency 'pronto-rubocop'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'pronto', '~> 0.6.0'
+  s.add_development_dependency 'pronto-rubocop', '~> 0.6.1'
+  s.add_development_dependency 'sqlite3', '~> 1.3'
+  s.add_development_dependency 'minitest', '~> 5.8'
+  s.add_development_dependency 'rake', '~> 10.5'
 end

data/etc/prosody.cfg.lua.tpl

@@ -59,7 +59,7 @@ modules_enabled = {
 		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
 
 	-- HTTP modules
-		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
+		"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
 		--"http_files"; -- Serve static files from a directory over HTTP
 
 	-- Other specific functionality
@@ -80,6 +80,15 @@ modules_disabled = {
 	-- "s2s"; -- Handle server-to-server connections
 };
 
+-- BOSH ports configuration
+bosh_ports = {
+  {
+    port = #{bosh_port};
+    path = "#{bosh_path}";
+    interface = "#{bosh_interface}";
+  }
+}
+
 -- NOTE if you append new plugin_paths do not remove the variable #{plugin_path}
 -- or copy all modules from the gem directory gem_diaspora-prosody-config
 plugin_paths = { "#{plugin_path}" }
@@ -144,8 +153,8 @@ authentication = "internal_plain"
 -- Logging configuration
 -- For advanced logging see http://prosody.im/doc/logging
 log = {
-	info = "log/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-	error = "log/prosody.err";
+	#{log_debug} = "#{log_info}"; -- Change 'info' to 'debug' for verbose logging
+	error = "#{log_error}";
 	-- "*syslog"; -- Uncomment this for logging to syslog
 	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
 }
@@ -165,8 +174,8 @@ VirtualHost "#{virtualhost_hostname}"
   }
 
   ssl = {
-    key = "certs/#{virtualhost_hostname}.key";
-    certificate = "certs/#{virtualhost_hostname}.crt";
+    key = "#{virtualhost_ssl_key}";
+    certificate = "#{virtualhost_ssl_crt}";
   }
 
   modules_enabled = {

data/lib/diaspora-prosody-config.rb

@@ -27,10 +27,10 @@ module Prosody
   DIASPORACFG = "#{FileUtils.pwd}/config/prosody.cfg.lua".freeze
 
   def self.start
-    check_sanity && system("#{find_binary} --config #{WRAPPERCFG}")
+    check_sanity.nil? && system("#{find_binary} --config #{WRAPPERCFG}")
   end
 
-  def self.update_configuration
+  def self.update_configuration(opts = {})
     # update prosody cfg in diaspora config dir
     gemcfg = "#{WRAPPERCFG}.tpl"
     unless File.exist?(DIASPORACFG)
@@ -38,21 +38,12 @@ module Prosody
     end
 
     config = File.read(DIASPORACFG)
-    config_params.each do |k, v|
-      begin
-        v = 'MySQL' if v.include?('mysql2')
-        v = 'PostgreSQL' if v.include?('postgresql')
-        v = 'SQLite3' if v.include?('sqlite3')
-      rescue
-        warn("Warning! #{k} is empty")
-      end
+    config_params(opts).each do |k, v|
       config.gsub!(/\#\{#{k}\}/, "#{v}")
     end
     File.open(WRAPPERCFG, 'w') {|f| f.write(config) }
   end
 
-  private
-
   def self.find_binary
     ENV['PATH'].split(':').each do |p|
       prosodybin = "#{p}/prosody"
@@ -76,28 +67,29 @@ module Prosody
     if version < Gem::Version.new('0.9.0')
       abort('your\'re prosody version should be >= 0.9.0')
     end
-    abort('wasn\'t able to detect the Diaspora environment') unless defined?(AppConfig)
-    abort('wasn\'t able to detect the Rails environment') unless defined?(Rails)
-
-    update_configuration
   end
 
-  def self.config_params
+  def self.config_params(opts)
     db = Rails.application.config.database_configuration[Rails.env]
     hostname = AppConfig.environment.url
       .gsub(/^http(s){0,1}:\/\/|\/$/, '')
       .to_s rescue 'localhost'
 
-    return {
-      plugin_path: "#{GEMDIR}/modules",
-      #log_info: AppConfig.chat.server.log.info.to_s,
-      #log_error: AppConfig.chat.server.log.error.to_s,
-      virtualhost_hostname: hostname,
-      virtualhost_driver: db['adapter'],
-      virtualhost_database: db['database'],
-      virtualhost_username: db['username'],
-      virtualhost_password: db['password'],
-      virtualhost_host: db['host']
-    }
+    opts[:virtualhost_ssl_key] = "#{opts[:certs]}/#{hostname}.key"
+    opts[:virtualhost_ssl_crt] = "#{opts[:certs]}/#{hostname}.crt"
+
+    opts[:plugin_path] = "#{GEMDIR}/modules"
+    opts[:virtualhost_hostname] =
+      hostname.gsub(/^http(s){0,1}:\/\/|\/$/, '').to_s rescue 'localhost'
+
+    opts[:virtualhost_driver] =
+      case opts[:virtualhost_driver]
+      when 'mysql2' then 'MySQL'
+      when 'postgresql' then 'PostgreSQL'
+      else 'SQLite3'
+      end
+    opts
   end
+
+  private_class_method :find_binary, :check_sanity, :config_params
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diaspora-prosody-config
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Lukas Matt
@@ -14,73 +14,73 @@ dependencies:
   name: pronto
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: pronto-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: A prosody config-wrapper for Diaspora
+        version: '10.5'
+description: This gem maps configuration options from Diaspora to Prosody.
 email: lukas@zauberstuhl.de
 executables: []
 extensions: []
@@ -125,5 +125,5 @@ rubyforge_project:
 rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
-summary: A prosody config-wrapper for Diaspora
+summary: Diaspora Configuration Wrapper For Prosodoy
 test_files: []