[openshift-origin-broker] updating to 1.1.1
tdawson
tdawson at fedoraproject.org
Tue Jan 15 17:25:56 UTC 2013
commit e678c81f381740e3ae6dca5fd956f1db5b1bb710
Author: Troy Dawson <tdawson at redhat.com>
Date: Tue Jan 15 11:25:42 2013 -0600
updating to 1.1.1
.gitignore | 1 +
...origin-broker-0.6.17-gemfile-dependancies.patch | 24 ---
openshift-origin-broker-0.6.17-httpd-2.4.patch | 26 ----
...-origin-broker-1.1.1-gemfile-dependancies.patch | 24 +++
openshift-origin-broker.spec | 148 +++++++++++++++----
sources | 2 +-
6 files changed, 143 insertions(+), 82 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 43ecf99..152b67b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/openshift-origin-broker-0.6.7.tar.gz
/openshift-origin-broker-0.6.17.tar.gz
+/openshift-origin-broker-1.1.1.tar.gz
diff --git a/openshift-origin-broker-1.1.1-gemfile-dependancies.patch b/openshift-origin-broker-1.1.1-gemfile-dependancies.patch
new file mode 100644
index 0000000..b361cd8
--- /dev/null
+++ b/openshift-origin-broker-1.1.1-gemfile-dependancies.patch
@@ -0,0 +1,24 @@
+diff -ur openshift-origin-broker-1.1.1.orig/Gemfile openshift-origin-broker-1.1.1/Gemfile
+--- openshift-origin-broker-1.1.1.orig/Gemfile 2012-12-20 11:54:12.000000000 -0600
++++ openshift-origin-broker-1.1.1/Gemfile 2013-01-15 11:09:46.616000000 -0600
+@@ -1,8 +1,8 @@
+ source 'http://rubygems.org'
+
+-gem 'rails', '~> 3.2.8'
++gem 'rails'
+ gem 'json'
+-gem 'parseconfig', '0.5.2'
++gem 'parseconfig'
+ gem 'mongo'
+ gem 'xml-simple'
+ gem 'rack'
+@@ -41,7 +41,7 @@
+ # and rake tasks are available in development mode:
+ group :development, :test do
+ # The require part from http://tinyurl.com/3pf68ho
+- gem 'mocha', '0.12.1', :require => nil
+- gem 'rake', '>= 0.8.7', '<= 0.9.2.2'
++ gem 'mocha'
++ gem 'rake'
+ gem 'cucumber'
+ end
diff --git a/openshift-origin-broker.spec b/openshift-origin-broker.spec
index 6056155..300721d 100644
--- a/openshift-origin-broker.spec
+++ b/openshift-origin-broker.spec
@@ -9,16 +9,16 @@
Summary: OpenShift Origin broker components
Name: openshift-origin-broker
-Version: 0.6.17
-Release: 4%{?dist}
+Version: 1.1.1
+Release: 2%{?dist}
License: ASL 2.0
URL: http://openshift.redhat.com
-Source0: http://mirror.openshift.com/pub/openshift-origin/source/%{name}/openshift-origin-broker-%{version}.tar.gz
+Source0: http://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{name}-%{version}.tar.gz
# Example blank favicon - upstream currently does not ship one
Source1: %{name}.favicon
-Patch1: openshift-origin-broker-0.6.17-gemfile-dependancies.patch
-Patch2: openshift-origin-broker-0.6.17-httpd-2.4.patch
+Patch1: openshift-origin-broker-1.1.1-gemfile-dependancies.patch
Requires: httpd
+Requires: bind
Requires: mod_ssl
Requires: mod_passenger
Requires: mongodb-server
@@ -40,7 +40,6 @@ Requires: systemd-units
%endif
Provides: openshift-broker = %{version}-%{release}
BuildArch: noarch
-Obsoletes: stickshift-broker <= %{version}-%{release}
%description
This contains the broker 'controlling' components of OpenShift Origin.
@@ -49,9 +48,6 @@ This includes the public APIs for the client tools.
%prep
%setup -q
%patch1 -p1
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-%patch2 -p1
-%endif
%build
@@ -77,6 +73,7 @@ mkdir -p %{buildroot}%{brokerdir}/tmp/sessions
mkdir -p %{buildroot}%{brokerdir}/tmp/sockets
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_sysconfdir}/openshift
cp -rp . %{buildroot}%{brokerdir}
%if %{with_systemd}
@@ -90,9 +87,28 @@ ln -s %{brokerdir}/public %{buildroot}%{brokerdir}/httpd/root/broker
ln -sf %{_sysconfdir}/httpd/modules %{buildroot}%{brokerdir}/httpd/modules
ln -sf /etc/httpd/conf/magic %{buildroot}%{brokerdir}/httpd/conf/magic
mv %{buildroot}%{brokerdir}/httpd/000000_openshift_origin_broker_proxy.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/
+mv %{buildroot}%{brokerdir}/httpd/000000_openshift_origin_broker_servername.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/
mkdir -p %{buildroot}%{_localstatedir}/log/openshift
+cp -p conf/broker.conf %{buildroot}%{_sysconfdir}/openshift/broker.conf
+cp -p conf/broker.conf %{buildroot}%{_sysconfdir}/openshift/broker-dev.conf
+
+%if 0%{?fedora} >= 18
+mv %{buildroot}%{brokerdir}/httpd/httpd.conf.apache-2.4 %{buildroot}%{brokerdir}/httpd/httpd.conf
+%else
+mv %{buildroot}%{brokerdir}/httpd/httpd.conf.apache-2.3 %{buildroot}%{brokerdir}/httpd/httpd.conf
+%endif
+rm %{buildroot}%{brokerdir}/httpd/httpd.conf.apache-*
+
+%if 0%{?rhel}%{?fedora} <= 6
+rm %{buildroot}%{brokerdir}/httpd/broker.conf
+mv %{buildroot}%{brokerdir}/httpd/broker-scl-ruby193.conf %{buildroot}%{brokerdir}/httpd/broker.conf
+%endif
+%if 0%{?fedora} >= 17
+rm %{buildroot}%{brokerdir}/httpd/broker-scl-ruby193.conf
+%endif
+
# Clean up stuff
rm -f %{buildroot}%{brokerdir}/.gitignore
rm -f %{buildroot}%{brokerdir}/LICENSE
@@ -106,16 +122,22 @@ chmod 644 %{buildroot}%{brokerdir}/config/environments/development.rb
%post
%if %{with_systemd}
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-%systemd_post %{name}.service
-%else
-if [ $1 -eq 1 ] ; then
- # Initial installation --
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-%endif
+systemctl --system daemon-reload
+# if under sysv, hopefully we don't need to reload anything
%endif
+# We are forced to create these log files if they don't exist because we have
+# command line tools that will load the Rails environment and create the logs
+# as root. We need the files labeled %ghost because we don't want these log
+# files overwritten on RPM upgrade.
+for l in %{_localstatedir}/log/openshift/user_action.log %{brokerdir}/log/{development,production}.log; do
+ if [ ! -f $l ]; then
+ touch $l
+ fi
+ chown apache:apache $l
+ chmod 640 $l
+done
+
%files
%doc LICENSE COPYRIGHT
@@ -125,29 +147,93 @@ fi
%attr(0644,-,-) %ghost %{_localstatedir}/log/openshift/user_action.log
%{brokerdir}
%{htmldir}/broker
-%config(noreplace) %{brokerdir}/config/environments/production.rb
-%config(noreplace) %{brokerdir}/config/environments/development.rb
%config(noreplace) %{_sysconfdir}/httpd/conf.d/000000_openshift_origin_broker_proxy.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/000000_openshift_origin_broker_servername.conf
+%config(noreplace) %{_sysconfdir}/openshift/broker.conf
+%{_sysconfdir}/openshift/broker-dev.conf
%defattr(-,root,root,-)
%if %{with_systemd}
%attr(0644,-,-) %{_unitdir}/openshift-broker.service
-%attr(0644,-,-) %config(noreplace) %{_sysconfdir}/sysconfig/openshift-broker
+%attr(0644,-,-) %{_sysconfdir}/sysconfig/openshift-broker
%else
-%attr(0755,-,-) %{_initddir}/openshift-broker
+%attr(0750,-,-) %{_initddir}/openshift-broker
%endif
%changelog
-* Mon Dec 10 2012 Troy Dawson <tdawson at redhat.com> 0.6.17-4
-- Fix parseconfig version dependancy (#884860)
-- httpd-2.4 patch only applied for F18+
-
-* Sat Nov 24 2012 Troy Dawson <tdawson at redhat.com> 0.6.17-3
-- Removed unnesessary dependancies
+* Fri Jan 11 2013 Troy Dawson <tdawson at redhat.com> 1.1.1-2
+- Updated spec file to match the version in Fedora
-* Wed Nov 21 2012 Troy Dawson <tdawson at redhat.com> 0.6.17-2
-- Fixup spec file to Fedora standards
-- selinux scripts moved to broker-util
+* Fri Jan 11 2013 Troy Dawson <tdawson at redhat.com> 1.1.1-1
+- BZ876324 resolve ServerName/NameVirtualHost situation for
+ node/broker/ssl.conf (lmeyer at redhat.com)
+- Minor tweak to the broker log owner/mode issue (bleanhar at redhat.com)
+- BZ888671 - oo-accept-broker or oo-accept-systems will create production.log,
+ the file's permission is wrong. (bleanhar at redhat.com)
+- Switched console port from 3128 to 8118 due to selinux changes in F17-18
+ Fixed openshift-node-web-proxy systemd script Updates to oo-setup-broker
+ script: - Fixes hardcoded example.com - Added basic auth based console
+ setup - added openshift-node-web-proxy setup Updated console build and spec
+ to work on F17 (kraman at gmail.com)
+- BZ876937 - Return "FAILED" if trying to stop openshift-console which is
+ already stopped (bleanhar at redhat.com)
+- create :default_gear_capabilities conf key for setting default gear
+ capabilities a user has at creation (lmeyer at redhat.com)
+- fixing mongo connection issues for build (dmcphers at redhat.com)
+- Bug 880370 (dmcphers at redhat.com)
+- Bug 878270 - everyone read user_action.log (bleanhar at redhat.com)
+- fix elif typos (dmcphers at redhat.com)
+- add oo-ruby (dmcphers at redhat.com)
+- Bug 878328 - Drupal and Wordpress should be tagged 'instant_app'
+ (ccoleman at redhat.com)
+- F18 compatibility fixes - apache 2.4 - mongo journaling - JDK 7 -
+ parseconfig gem update Bugfix for Bind DNS plugin (kraman at gmail.com)
+- Fix tests to work with remote-user auth (miciah.masters at gmail.com)
+- add additional gem deps (dmcphers at redhat.com)
+- Merge remote-tracking branch 'origin/master' into
+ us3046_quickstarts_and_app_types (ccoleman at redhat.com)
+- update Gemfile version (dmcphers at redhat.com)
+- use version 0.12.0 (dmcphers at redhat.com)
+- remove mocha version (dmcphers at redhat.com)
+- fixing tests (dmcphers at redhat.com)
+- getting tests working (dmcphers at redhat.com)
+- getting specs up to 1.9 sclized (dmcphers at redhat.com)
+- Merge remote-tracking branch 'origin/master' into
+ us3046_quickstarts_and_app_types (ccoleman at redhat.com)
+- Implement all templates as the base quickstarts, and make quickstart.rb a bit
+ more flexible (ccoleman at redhat.com)
+- Support COMMUNITY_QUICKSTARTS_URL parameter for serving hardcoded quickstarts
+ vs. public quickstarts, and test that these values are returned.
+ (ccoleman at redhat.com)
+- specifying rake gem version range (abhgupta at redhat.com)
+- specifying mocha gem version and fixing tests (abhgupta at redhat.com)
+- BZ873970, BZ873966 - disabling HTTP TRACE for the Broker, Nodes and Console
+ (bleanhar at redhat.com)
+- Adding rewrites to / to go to /console for http and https vhosts Added
+ NamedVirtualHost for the 443 vhost to avoid conflict with ssl.conf
+ (calfonso at redhat.com)
+- Set ENV["RAILS_ENV"] in boot.rb (miciah.masters at gmail.com)
+- Removing node gem requirement from broker script (kraman at gmail.com)
+- Bug 871436 - moving the default path for AUTH_PRIVKEYFILE and AUTH_PUBKEYFILE
+ under /etc (bleanhar at redhat.com)
+- OpenShift Origin console package (calfonso at redhat.com)
+- BZ870385 - Remove unnecessary %%post logfile touching from the Broker
+ (bleanhar at redhat.com)
+- Removing a useless semanage command from the broker's %%postun
+ (bleanhar at redhat.com)
+- openshift-origin-broker rpmdiff errors (bleanhar at 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 at gmail.com)
+- fixing file name typo in usage and fixing domain name in test environment
+ file (abhgupta at redhat.com)
+- Bug 868331 - corrected test (lnader at redhat.com)
+- remove various hardcoded usage of file in /tmp (mscherer at redhat.com)
* Mon Oct 22 2012 Brenton Leanhardt <bleanhar at redhat.com> 0.6.17-1
- Merge pull request #737 from sosiouxme/master (dmcphers at redhat.com)
diff --git a/sources b/sources
index dd5f635..bd24d51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-93ba352c8f49cf76b294f7f4a3228d5f openshift-origin-broker-0.6.17.tar.gz
+bd4bcf390ede49530b1baaa21e586af3 openshift-origin-broker-1.1.1.tar.gz
More information about the scm-commits
mailing list