openshift-origin-dns-bind 0.8.12 → 1.1.1

data/config/initializers/openshift-origin-dns-bind.rb

@@ -0,0 +1,22 @@
+require 'openshift-origin-common'
+
+Broker::Application.configure do
+  conf_file = File.join(OpenShift::Config::PLUGINS_DIR, File.basename(__FILE__, '.rb') + '.conf')
+  if Rails.env.development?
+    dev_conf_file = File.join(OpenShift::Config::PLUGINS_DIR, File.basename(__FILE__, '.rb') + '-dev.conf')
+    if File.exist? dev_conf_file
+      conf_file = dev_conf_file
+    else
+      Rails.logger.info "Development configuration for #{File.basename(__FILE__, '.rb')} not found. Using production configuration."
+    end
+  end
+  conf = OpenShift::Config.new(conf_file)
+
+  config.dns = {
+    :server => conf.get("BIND_SERVER", "127.0.0.1"),
+    :port => conf.get("BIND_PORT", "53").to_i,
+    :keyname => conf.get("BIND_KEYNAME", "example.com"),
+    :keyvalue => conf.get("BIND_KEYVALUE", "base64-encoded key, most likely from /var/named/example.com.key."),
+    :zone => conf.get("BIND_ZONE", "example.com")
+  }
+end

data/lib/bind_dns_engine.rb

@@ -0,0 +1,7 @@
+require 'openshift-origin-controller'
+require 'rails'
+
+module OpenShift
+  class BindDnsEngine < Rails::Engine
+  end
+end

data/lib/openshift-origin-dns-bind.rb

@@ -2,9 +2,9 @@ require "openshift-origin-common"
 
 module OpenShift
   module BindDnsModule
-    require 'openshift-origin-dns-bind/engine/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+    require 'bind_dns_engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
   end
 end
 
-require "openshift-origin-dns-bind/lib/openshift/bind_plugin.rb"
+require "openshift/bind_plugin.rb"
 OpenShift::DnsService.provider=OpenShift::BindPlugin

data/openshift-origin-dns-bind.gemspec

@@ -1,24 +1,26 @@
 # -*- encoding: utf-8 -*-
+config_dir  = File.join(File.join("config", "**"), "*")
 $:.push File.expand_path("../lib", __FILE__)
 lib_dir  = File.join(File.join("lib", "**"), "*")
 test_dir  = File.join(File.join("test", "**"), "*")
 bin_dir  = File.join("bin", "*")
 doc_dir  = File.join(File.join("doc", "**"), "*")
+conf_dir  = File.join(File.join("conf", "**"), "*")
 spec_file = "rubygem-openshift-origin-dns-bind.spec"
 
 Gem::Specification.new do |s|
   s.name        = "openshift-origin-dns-bind"
-  s.version     = `rpm -q --qf "%{version}\n" --specfile #{spec_file}`.split[0]
-  s.license     = `rpm -q --qf "%{license}\n" --specfile #{spec_file}`.split[0]
+  s.version     = `rpm -q --define 'rhel 7' --qf "%{version}\n" --specfile #{spec_file}`.split[0]
+  s.license     = `rpm -q --define 'rhel 7' --qf "%{license}\n" --specfile #{spec_file}`.split[0]
   s.authors     = ["Krishna Raman"]
   s.email       = ["kraman@gmail.com"]
-  s.homepage    = `rpm -q --qf "%{url}\n" --specfile #{spec_file}`.split[0]
-  s.summary     = `rpm -q --qf "%{description}\n" --specfile #{spec_file}`.split[0]
-  s.description = `rpm -q --qf "%{description}\n" --specfile #{spec_file}`.split[0]
+  s.homepage    = `rpm -q --define 'rhel 7' --qf "%{url}\n" --specfile #{spec_file}`.split[0]
+  s.summary     = `rpm -q --define 'rhel 7' --qf "%{description}\n" --specfile #{spec_file}`.split[0]
+  s.description = `rpm -q --define 'rhel 7' --qf "%{description}\n" --specfile #{spec_file}`.split[0]
 
   s.rubyforge_project = "openshift-origin-dns-bind"
 
-  s.files       = Dir[lib_dir] + Dir[doc_dir]
+  s.files       = Dir[lib_dir] + Dir[doc_dir] + Dir[conf_dir] + Dir[config_dir]
   s.test_files  = Dir[test_dir]
   s.executables   = Dir[bin_dir]
   s.files       += %w(README.md Rakefile Gemfile rubygem-openshift-origin-dns-bind.spec openshift-origin-dns-bind.gemspec LICENSE COPYRIGHT)
@@ -27,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency('openshift-origin-controller')
   s.add_dependency('json')  
   s.add_dependency('dnsruby')
-  s.add_development_dependency('rake')  
+  s.add_development_dependency('rake', '>= 0.8.7', '<= 0.9.2.2')  
   s.add_development_dependency('rspec')
   s.add_development_dependency('bundler')
   s.add_development_dependency('mocha')

data/rubygem-openshift-origin-dns-bind.spec

@@ -1,139 +1,118 @@
-%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname openshift-origin-dns-bind
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%if 0%{?fedora}%{?rhel} <= 6
+    %global scl ruby193
+    %global scl_prefix ruby193-
+%endif
+%{!?scl:%global pkg_name %{name}}
+%{?scl:%scl_package rubygem-%{gem_name}}
+%global gem_name openshift-origin-dns-bind
+%global rubyabi 1.9.1
 
 Summary:        OpenShift plugin for BIND service
-Name:           rubygem-%{gemname}
-Version:        0.8.12
+Name:           rubygem-%{gem_name}
+Version:        1.1.1
 Release:        1%{?dist}
 Group:          Development/Languages
 License:        ASL 2.0
 URL:            http://openshift.redhat.com
-Source0:        rubygem-%{gemname}-%{version}.tar.gz
+Source0:        rubygem-%{gem_name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ruby(abi) >= 1.8
-Requires:       rubygems
+Requires:       %{?scl:%scl_prefix}ruby(abi) = %{rubyabi}
+Requires:       %{?scl:%scl_prefix}ruby
+Requires:       %{?scl:%scl_prefix}rubygems
+Requires:       %{?scl:%scl_prefix}rubygem(json)
+Requires:       %{?scl:%scl_prefix}rubygem(dnsruby)
 Requires:       rubygem(openshift-origin-common)
-Requires:       rubygem(json)
 Requires:       bind
 Requires:       bind-utils
-Requires:       rubygem(dnsruby)
 Requires:       openshift-origin-broker
-Requires:  		selinux-policy-targeted
-Requires:  		policycoreutils-python
-Obsoletes:      rubygem-uplift-bind-plugin
-
-BuildRequires:  ruby
-BuildRequires:  rubygems
+Requires:     selinux-policy-targeted
+Requires:     policycoreutils-python
+%if 0%{?fedora}%{?rhel} <= 6
+BuildRequires:  ruby193-build
+BuildRequires:  scl-utils-build
+%endif
+BuildRequires:  %{?scl:%scl_prefix}ruby(abi) = %{rubyabi}
+BuildRequires:  %{?scl:%scl_prefix}ruby 
+BuildRequires:  %{?scl:%scl_prefix}rubygems
+BuildRequires:  %{?scl:%scl_prefix}rubygems-devel
 BuildArch:      noarch
-Provides:       rubygem(%{gemname}) = %version
-
-%package -n ruby-%{gemname}
-Summary:        OpenShift plugin for Bind service
-Requires:       rubygem(%{gemname}) = %version
-Provides:       ruby(%{gemname}) = %version
+Provides:       rubygem(%{gem_name}) = %version
+Obsoletes:      rubygem-uplift-bind-plugin
 
 %description
 Provides a Bind DNS service based plugin
 
-%description -n ruby-%{gemname}
-Provides a Bind DNS service based plugin
-
 %prep
 %setup -q
 
 %build
+%{?scl:scl enable %scl - << \EOF}
+mkdir -p ./%{gem_dir}
+# Create the gem as gem install only works on a gem file
+gem build %{gem_name}.gemspec
+export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
+# gem install compiles any C extensions and installs into a directory
+# We set that to be a local directory so that we can move it into the
+# buildroot in %%install
+gem install -V \
+        --local \
+        --install-dir ./%{gem_dir} \
+        --bindir ./%{_bindir} \
+        --force \
+        --rdoc \
+        %{gem_name}-%{version}.gem
+%{?scl:EOF}
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir}
-mkdir -p %{buildroot}%{ruby_sitelib}
-
-# Build and install into the rubygem structure
-gem build %{gemname}.gemspec
-gem install --local --install-dir %{buildroot}%{gemdir} --force %{gemname}-%{version}.gem
-
-# Symlink into the ruby site library directories
-ln -s %{geminstdir}/lib/%{gemname} %{buildroot}%{ruby_sitelib}
-ln -s %{geminstdir}/lib/%{gemname}.rb %{buildroot}%{ruby_sitelib}
+mkdir -p %{buildroot}%{gem_dir}
+cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
 
 # Add documents/examples
 mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/
 cp -r doc/* %{buildroot}%{_docdir}/%{name}-%{version}/
 
+#Config file
+mkdir -p %{buildroot}/etc/openshift/plugins.d
+cp %{buildroot}/%{gem_dir}/gems/%{gem_name}-%{version}/conf/openshift-origin-dns-bind.conf.example %{buildroot}/etc/openshift/plugins.d/openshift-origin-dns-bind.conf.example
+
 # Compile SELinux policy
 mkdir -p %{buildroot}/usr/share/selinux/packages/rubygem-openshift-origin-dns-bind
-cp %{buildroot}%{gemdir}/gems/openshift-origin-dns-bind-*/doc/examples/dhcpnamedforward.* %{buildroot}/usr/share/selinux/packages/rubygem-openshift-origin-dns-bind
+cp %{buildroot}%{gem_dir}/gems/openshift-origin-dns-bind-*/doc/examples/dhcpnamedforward.* %{buildroot}/usr/share/selinux/packages/rubygem-openshift-origin-dns-bind
 
 %clean
 rm -rf %{buildroot}                                
 
 %files
 %defattr(-,root,root,-)
+%doc %{gem_docdir}
 %doc %{_docdir}/%{name}-%{version}
-%dir %{geminstdir}
-%doc %{geminstdir}/Gemfile
-%{gemdir}/doc/%{gemname}-%{version}
-%{gemdir}/gems/%{gemname}-%{version}
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%{gem_instdir}
+%{gem_spec}
+%{gem_cache}
 /usr/share/selinux/packages/rubygem-openshift-origin-dns-bind
+/etc/openshift/plugins.d/openshift-origin-dns-bind.conf.example
 
-%files -n ruby-%{gemname}
-%{ruby_sitelib}/%{gemname}
-%{ruby_sitelib}/%{gemname}.rb
 
 %changelog
+* Fri Jan 11 2013 Troy Dawson <tdawson@redhat.com> 1.1.1-1
+- updated gemspecs so they work with scl rpm spec files. (tdawson@redhat.com)
+- F18 compatibility fixes   - apache 2.4   - mongo journaling   - JDK 7   -
+  parseconfig gem update Bugfix for Bind DNS plugin (kraman@gmail.com)
+- add config to gemspec (dmcphers@redhat.com)
+- Moving plugins to Rails 3.2.8 engine (kraman@gmail.com)
+- getting specs up to 1.9 sclized (dmcphers@redhat.com)
+- specifying rake gem version range (abhgupta@redhat.com)
+- Moving broker config to /etc/openshift/broker.conf Rails app and all oo-*
+  scripts will load production environment unless the
+  /etc/openshift/development marker is present Added param to specify default
+  when looking up a config value in OpenShift::Config Moved all defaults into
+  plugin initializers instead of separate defaults file No longer require
+  loading 'openshift-origin-common/config' if 'openshift-origin-common' is
+  loaded openshift-origin-common selinux module is merged into F16 selinux
+  policy. Removing from broker %%postrun (kraman@gmail.com)
+
 * Tue Oct 23 2012 Brenton Leanhardt <bleanhar@redhat.com> 0.8.12-1
 - removing remaining cases of SS and config.ss (dmcphers@redhat.com)
 - Making openshift-origin-msg-broker-mcollective a Rails engine so that it can
   hook into Rails initializers Making openshift-origin-dns-bind a Rails engine
-  so that it can hook into Rails initializers (kraman@gmail.com)
-
-* Thu Oct 11 2012 Brenton Leanhardt <bleanhar@redhat.com> 0.8.11-1
-- Centralize plug-in configuration (miciah.masters@gmail.com)
-
-* Tue Oct 09 2012 Brenton Leanhardt <bleanhar@redhat.com> 0.8.10-1
-- Merge pull request #613 from kraman/master (openshift+bot@redhat.com)
-- Module name and gem path fixes for auth plugins (kraman@gmail.com)
-
-* Mon Oct 08 2012 Dan McPherson <dmcphers@redhat.com> 0.8.9-1
-- Fixing obsoletes for openshift-origin-port-proxy (kraman@gmail.com)
-
-* Fri Oct 05 2012 Krishna Raman <kraman@gmail.com> 0.8.8-1
-- new package built with tito
-
-* Thu Aug 30 2012 Brenton Leanhardt <bleanhar@redhat.com> 0.8.7-1
-- adding dnsruby dependency in bind plugin gemspec and spec file
-  (abhgupta@redhat.com)
-
-* Mon Aug 20 2012 Brenton Leanhardt <bleanhar@redhat.com> 0.8.6-1
-- gemspec refactorings based on Fedora packaging feedback (bleanhar@redhat.com)
-- allow ruby versions > 1.8 (mlamouri@redhat.com)
-- setup broker/nod script fixes for static IP and custom ethernet devices add
-  support for configuring different domain suffix (other than example.com)
-  Fixing dependency to qpid library (causes fedora package conflict) Make
-  livecd start faster by doing static configuration during cd build rather than
-  startup Fixes some selinux policy errors which prevented scaled apps from
-  starting (kraman@gmail.com)
-- Removing requirement to disable NetworkManager so that liveinst works Adding
-  initial support for dual interfaces Adding "xhost +" so that liveinst can
-  continue to work after hostname change to broker.example.com Added delay
-  befor launching firefox so that network is stable Added rndc key generation
-  for Bind Dns plugin instead of hardcoding it (kraman@gmail.com)
-- Add modify application dns and use where applicable (dmcphers@redhat.com)
-- MCollective updates - Added mcollective-qpid plugin - Added mcollective-
-  msg-broker plugin - Added mcollective agent and facter plugins - Added
-  option to support ignoring node profile - Added systemu dependency for
-  mcollective-client (kraman@gmail.com)
-
-* Wed May 30 2012 Krishna Raman <kraman@gmail.com> 0.8.5-1
-- Adding livecd build scripts Adding a text only minimal version of livecd
-  Added ability to access livecd dns from outside VM (kraman@gmail.com)
-
-* Fri Apr 27 2012 Krishna Raman <kraman@gmail.com> 0.8.4-1
-- cleaning up spec files (dmcphers@redhat.com)
-
-* Sat Apr 21 2012 Krishna Raman <kraman@gmail.com> 0.8.3-1
-- new package built with tito
+  so that it can hook into Rails initializers (kraman@gmail.com)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openshift-origin-dns-bind
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 17
   prerelease: false
   segments: 
-  - 0
-  - 8
-  - 12
-  version: 0.8.12
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Krishna Raman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-23 00:00:00 -04:00
+date: 2013-01-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,10 +68,21 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 49
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 7
+        version: 0.8.7
+    - - <=
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 9
+        - 2
+        - 2
+        version: 0.9.2.2
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -126,10 +137,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/openshift-origin-dns-bind/engine/engine.rb
-- lib/openshift-origin-dns-bind/config/initializers/openshift-origin-dns-bind.rb
-- lib/openshift-origin-dns-bind/config/initializers/openshift-origin-dns-bind-defaults.conf
-- lib/openshift-origin-dns-bind/lib/openshift/bind_plugin.rb
+- lib/openshift/bind_plugin.rb
+- lib/bind_dns_engine.rb
 - lib/openshift-origin-dns-bind.rb
 - doc/examples/Kexample.com.+157+37399.private
 - doc/examples/192.168.0.reverse.db
@@ -141,6 +150,8 @@ files:
 - doc/examples/dhclient-up-hooks
 - doc/examples/named.conf
 - doc/README.local_dns
+- conf/openshift-origin-dns-bind.conf.example
+- config/initializers/openshift-origin-dns-bind.rb
 - README.md
 - Rakefile
 - Gemfile

data/lib/openshift-origin-dns-bind/config/initializers/openshift-origin-dns-bind.rb

@@ -1,14 +0,0 @@
-require 'openshift-origin-common/config'
-
-Broker::Application.configure do
-  conf = OpenShift::Config.new(File.join(OpenShift::Config::PLUGINS_DIR, File.basename(__FILE__, '.rb') + '.conf'))
-  defaults = OpenShift::Config.new(File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb') + '-defaults.conf'))
-
-  config.dns = {
-    :server => conf.get("BIND_SERVER") || defaults.get("BIND_SERVER"),
-    :port => (conf.get("BIND_PORT") || defaults.get("BIND_PORT")).to_i,
-    :keyname => conf.get("BIND_KEYNAME") || defaults.get("BIND_KEYNAME"),
-    :keyvalue => conf.get("BIND_KEYVALUE") || defaults.get("BIND_KEYVALUE"),
-    :zone => conf.get("BIND_ZONE") || defaults.get("BIND_ZONE")
-  }
-end

data/lib/openshift-origin-dns-bind/engine/engine.rb

@@ -1,10 +0,0 @@
-require 'openshift-origin-controller'
-require 'rails'
-
-module OpenShift
-  class BindDnsEngine < Rails::Engine
-    paths.lib                  << "lib/openshift-origin-bind-dns/lib"
-    paths.config               << "lib/openshift-origin-bind-dns/config"
-    config.autoload_paths      += %W(#{config.root}/lib)
-  end
-end