[rubygem-openshift-origin-node] update to version 1.3.6
tdawson
tdawson at fedoraproject.org
Wed Jan 30 15:40:14 UTC 2013
commit 6bfdca6c6e3b2e093eee0ea5698e81bd239ef900
Author: Troy Dawson <tdawson at redhat.com>
Date: Wed Jan 30 09:40:06 2013 -0600
update to version 1.3.6
.gitignore | 1 +
000001_openshift_origin_node.conf | 11 +++-
000001_openshift_origin_node_servername.conf | 5 ++
rubygem-openshift-origin-node.spec | 91 +++++++++++++++++---------
sources | 2 +-
5 files changed, 77 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fed5b2b..ffdab98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/openshift-origin-node-0.14.6.gem
/openshift-origin-node-1.1.7.gem
/openshift-origin-node-1.2.6.gem
+/openshift-origin-node-1.3.6.gem
diff --git a/000001_openshift_origin_node.conf b/000001_openshift_origin_node.conf
index ab2f7d9..de502fb 100644
--- a/000001_openshift_origin_node.conf
+++ b/000001_openshift_origin_node.conf
@@ -4,29 +4,36 @@
</Directory>
<VirtualHost *:80>
- ServerName localhost
+ # ServerName we inherit from main config.
+ ServerAlias localhost
ServerAdmin root at localhost
DocumentRoot /var/www/html
+ # in general, if request comes in for nonexistent app, show "getting started" page.
RewriteEngine On
RewriteRule ^(.*)$ http://%{HTTP_HOST}/getting_started.html
</VirtualHost>
<VirtualHost *:443>
- ServerName localhost
+ # ServerName we inherit from main config.
+ ServerAlias localhost
ServerAdmin root at localhost
DocumentRoot /var/www/html
SSLEngine on
SSLProxyEngine on
SSLCertificateFile /etc/pki/tls/certs/localhost.crt
SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
+ # in general, if request comes in for nonexistent app, show "getting started" page.
RewriteEngine On
RewriteRule ^(.*)$ https://%{HTTP_HOST}/getting_started.html
</VirtualHost>
+# need these for the gear vhosts at least.
NameVirtualHost *:80
NameVirtualHost *:443
+
ProxyPreserveHost On
RequestHeader unset X-Forwarded-For
TraceEnable off
+# Include gear vhosts
include conf.d/openshift/*.conf
diff --git a/000001_openshift_origin_node_servername.conf b/000001_openshift_origin_node_servername.conf
new file mode 100644
index 0000000..1b6f214
--- /dev/null
+++ b/000001_openshift_origin_node_servername.conf
@@ -0,0 +1,5 @@
+# Feel free to change this as desired. It serves to provide
+# a consistent default ServerName for all vhosts.
+
+ServerName localhost
+
diff --git a/rubygem-openshift-origin-node.spec b/rubygem-openshift-origin-node.spec
index 81aa928..d2bb71b 100644
--- a/rubygem-openshift-origin-node.spec
+++ b/rubygem-openshift-origin-node.spec
@@ -1,9 +1,3 @@
-%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-node
%global rubyabi 1.9.1
@@ -12,20 +6,21 @@
Summary: Cloud Development Node
Name: rubygem-%{gem_name}
-Version: 1.2.6
-Release: 1%{?dist}
+Version: 1.3.6
+Release: 2%{?dist}
Group: Development/Languages
License: ASL 2.0
URL: http://openshift.redhat.com
-Source0: https://mirror.openshift.com/pub/origin-server/source/rubygem-%{gem_name}/%{gem_name}-%{version}.gem
+Source0: https://mirror.openshift.com/pub/openshift-origin/source/rubygem-%{gem_name}/%{gem_name}-%{version}.gem
Source1: 000001_openshift_origin_node.conf
-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(parseconfig)
-Requires: %{?scl:%scl_prefix}rubygem(mocha)
-Requires: %{?scl:%scl_prefix}rubygem(rspec)
+Source2: 000001_openshift_origin_node_servername.conf
+Requires: ruby(abi) = %{rubyabi}
+Requires: ruby
+Requires: rubygems
+Requires: rubygem(json)
+Requires: rubygem(parseconfig)
+Requires: rubygem(mocha)
+Requires: rubygem(rspec)
Requires: rubygem(openshift-origin-common)
Requires: python
Requires: libselinux-python
@@ -38,31 +33,22 @@ Requires: libcgroup-tools
%endif
Requires: pam_openshift
Requires: quota
-
-%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
+BuildRequires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby
+BuildRequires: rubygems
+BuildRequires: rubygems-devel
BuildArch: noarch
Provides: rubygem(%{gem_name}) = %version
-Obsoletes: rubygem-stickshift-node
%description
This contains the Cloud Development Node packaged as a rubygem.
%prep
-%{?scl:scl enable %scl - << \EOF}
gem unpack %{SOURCE0}
%setup -q -D -T -n %{gem_name}-%{version}
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
-%{?scl:EOF}
%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
@@ -78,7 +64,6 @@ gem install -V \
--force \
--rdoc \
%{gem_name}-%{version}.gem
-%{?scl:EOF}
%install
mkdir -p %{buildroot}%{gem_dir}
@@ -117,6 +102,8 @@ mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/
mv %{buildroot}%{gem_instdir}/misc/doc/cgconfig.conf %{buildroot}%{_docdir}/%{name}-%{version}/cgconfig.conf
cp -p %{SOURCE1} %{buildroot}/etc/httpd/conf.d/000001_openshift_origin_node.conf
+cp -p %{SOURCE2} %{buildroot}/etc/httpd/conf.d/000001_openshift_origin_node_servername.conf
+
# http 2.4.2 option change
%if 0%{?fedora} >= 18
sed -i 's/^include/IncludeOptional/' %{buildroot}%{_sysconfdir}/httpd/conf.d/000001_openshift_origin_node.conf
@@ -130,8 +117,12 @@ mkdir -p %{buildroot}/etc/systemd/system
mv %{buildroot}%{gem_instdir}/misc/services/openshift-cgroups.service %{buildroot}/etc/systemd/system/openshift-cgroups.service
%endif
+# Cleanup
# Don't install or package what's left in the misc directory
rm -rf %{buildroot}%{gem_instdir}/misc
+rm -rf %{buildroot}%{gem_instdir}/.yardoc
+chmod 750 %{buildroot}/usr/bin/oo-admin-ctl-cgroups
+chmod 755 %{buildroot}%{gem_instdir}/test/unit/*.rb
%files
%doc LICENSE COPYRIGHT
@@ -146,6 +137,8 @@ rm -rf %{buildroot}%{gem_instdir}/misc
/etc/httpd/conf.d/openshift
%config(noreplace) /etc/httpd/conf.d/000001_openshift_origin_node.conf
+%config(noreplace) /etc/httpd/conf.d/000001_openshift_origin_node_servername.conf
+
%attr(0755,-,-) %{appdir}
%if 0%{?fedora}%{?rhel} <= 6
@@ -171,6 +164,44 @@ if ! [ -f /etc/openshift/resource_limits.conf ]; then
fi
%changelog
+* Tue Jan 29 2013 Troy Dawson <tdawson at redhat.com> 1.3.6-2
+- Change the source from a tar to gem
+- Remove scl for Fedora standards
+
+* Wed Jan 23 2013 Adam Miller <admiller at redhat.com> 1.3.6-1
+- Bug 903152: Execute git tidy ops as gear user (ironcladlou at gmail.com)
+
+* Mon Jan 21 2013 Adam Miller <admiller at redhat.com> 1.3.5-1
+- BZ 901449: An SELinux issue prevents forces this script to use system ruby
+ and not the SCL version. (rmillner at redhat.com)
+
+* Fri Jan 18 2013 Dan McPherson <dmcphers at redhat.com> 1.3.4-1
+- Bug 901444 (dmcphers at redhat.com)
+- SSL support for custom domains. (mpatel at redhat.com)
+- Replace expose/show/conceal-port hooks with Endpoints (ironcladlou at gmail.com)
+
+* Mon Jan 14 2013 Adam Miller <admiller at redhat.com> 1.3.3-1
+- Fix BZ875200: Add statements to rhcsh ctl_all (pmorie at gmail.com)
+- Merge pull request #1141 from pmorie/bugs/877306
+ (dmcphers+openshiftbot at redhat.com)
+- Merge pull request #1140 from pmorie/bugs/877305
+ (dmcphers+openshiftbot at redhat.com)
+- Fix usage for oo-admin-ctl-cgroups (pmorie at gmail.com)
+- Add newline to each user for oo-admin-ctl-cgroups stopall (pmorie at gmail.com)
+
+* Thu Jan 10 2013 Adam Miller <admiller at redhat.com> 1.3.2-1
+- Merge pull request #1120 from sosiouxme/BZ876324
+ (dmcphers+openshiftbot at redhat.com)
+- BZ876324 resolve ServerName/NameVirtualHost situation for
+ node/broker/ssl.conf (lmeyer at redhat.com)
+- Update rhc command usage. Addresses BZ889018. (asari.ruby at gmail.com)
+- Typo. (rmillner at redhat.com)
+- BZ 888410: The reader sequence can block if there is too much stderr
+ (rmillner at redhat.com)
+
+* Wed Dec 12 2012 Adam Miller <admiller at redhat.com> 1.3.1-1
+- bump_minor_versions for sprint 22 (admiller at redhat.com)
+
* Mon Dec 10 2012 Adam Miller <admiller at redhat.com> 1.2.6-1
- Merge pull request #1007 from sosiouxme/US3036-origin
(openshift+bot at redhat.com)
diff --git a/sources b/sources
index b5195d4..a79c8c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-820c27d7c3f12c7afa571048044dd26a openshift-origin-node-1.2.6.gem
+2ea718f94b81d993e291abad9f52e4c3 openshift-origin-node-1.3.6.gem
More information about the scm-commits
mailing list