[openshift-origin-node-proxy] Initial import (#917149).
tdawson
tdawson at fedoraproject.org
Mon Sep 16 14:55:56 UTC 2013
commit 66538bc53317391a4a62edc889f45480e6d339c4
Author: Troy Dawson <tdawson at redhat.com>
Date: Mon Sep 16 09:55:41 2013 -0500
Initial import (#917149).
.gitignore | 1 +
openshift-origin-node-proxy-1.11.1-logrotate.patch | 11 +
openshift-origin-node-proxy-LICENSE | 11 +
openshift-origin-node-proxy-README | 28 +++
openshift-origin-node-proxy.spec | 257 ++++++++++++++++++++
sources | 1 +
6 files changed, 309 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..0075a04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/openshift-origin-node-proxy-1.11.1.1.tar.gz
diff --git a/openshift-origin-node-proxy-1.11.1-logrotate.patch b/openshift-origin-node-proxy-1.11.1-logrotate.patch
new file mode 100644
index 0000000..2ac616c
--- /dev/null
+++ b/openshift-origin-node-proxy-1.11.1-logrotate.patch
@@ -0,0 +1,11 @@
+diff -urp openshift-origin-node-proxy-1.11.1.orig/config/logrotate.d/openshift-node-web-proxy openshift-origin-node-proxy-1.11.1/config/logrotate.d/openshift-node-web-proxy
+--- openshift-origin-node-proxy-1.11.1.orig/config/logrotate.d/openshift-node-web-proxy 2013-06-10 16:50:57.000000000 -0500
++++ openshift-origin-node-proxy-1.11.1/config/logrotate.d/openshift-node-web-proxy 2013-07-25 13:37:23.698000000 -0500
+@@ -9,6 +9,6 @@
+ rotate 5
+ sharedscripts
+ postrotate
+- /sbin/service openshift-node-web-proxy restart > /dev/null 2>/dev/null || true
++ /usr/bin/systemctl restart openshift-node-web-proxy.service > /dev/null 2>/dev/null || true
+ endscript
+ }
diff --git a/openshift-origin-node-proxy-LICENSE b/openshift-origin-node-proxy-LICENSE
new file mode 100644
index 0000000..90edcee
--- /dev/null
+++ b/openshift-origin-node-proxy-LICENSE
@@ -0,0 +1,11 @@
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/openshift-origin-node-proxy-README b/openshift-origin-node-proxy-README
new file mode 100644
index 0000000..a59d467
--- /dev/null
+++ b/openshift-origin-node-proxy-README
@@ -0,0 +1,28 @@
+
+OpenShift Origin Node routing proxy
+-----------------------------------
+
+Licensed under the Apache License 2.0 (see the file LICENSE in this
+directory for details). Some portions are covered by the following
+copyright and license notice:
+
+Copyright (c) 2012 ramr mpatel
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
diff --git a/openshift-origin-node-proxy.spec b/openshift-origin-node-proxy.spec
new file mode 100644
index 0000000..4fa22d1
--- /dev/null
+++ b/openshift-origin-node-proxy.spec
@@ -0,0 +1,257 @@
+%global npm_name openshift-node-web-proxy
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
+%global with_systemd 1
+%else
+%global with_systemd 0
+%endif
+
+Summary: Routing proxy for OpenShift Origin Node
+Name: openshift-origin-node-proxy
+Version: 1.11.1.1
+Release: 3%{?dist}
+License: ASL 2.0
+URL: http://www.openshift.com
+Source0: http://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{name}-%{version}.tar.gz
+## Wrong license was put in upstream, fixed upstream but not released yet
+Source1: %{name}-LICENSE
+Source2: %{name}-README
+## logrotate.patch - use systemctl instead of service to restart service
+## Fixed upstream, but not released yet.
+Patch1: openshift-origin-node-proxy-1.11.1-logrotate.patch
+Requires: nodejs
+Requires: nodejs-async
+Requires: nodejs-optimist
+Requires: nodejs-supervisor
+Requires: nodejs-ws
+%if %{with_systemd}
+Requires: systemd-units
+BuildRequires: systemd-units
+%endif
+BuildRequires: nodejs-devel
+BuildArch: noarch
+
+%description
+This package contains a routing proxy (for handling HTTP[S] and Websockets
+traffic) for an OpenShift Origin node.
+
+%prep
+%setup -q
+%if %{with_systemd}
+%patch1 -p 1
+%endif
+
+%build
+
+%install
+# Runtime directories.
+mkdir -p %{buildroot}%{_var}/lock/subsys
+mkdir -p %{buildroot}%{_var}/run
+
+# Fixup LICENSE
+rm -f LICENSE
+cp %{SOURCE1} LICENSE
+cp %{SOURCE2} README
+
+%if %{with_systemd}
+mkdir -p %{buildroot}%{_unitdir}
+install -D -p -m 644 scripts/systemd/openshift-node-web-proxy.service %{buildroot}%{_unitdir}
+install -D -p -m 644 scripts/systemd/openshift-node-web-proxy.env %{buildroot}%{_sysconfdir}/sysconfig/openshift-node-web-proxy
+%else
+mkdir -p %{buildroot}%{_initddir}
+install -D -p -m 755 scripts/init.d/openshift-node-web-proxy %{buildroot}%{_initddir}
+%endif
+
+mkdir -p %{buildroot}%{_bindir}
+install -p -m 755 scripts/bin/node-find-proxy-route-files %{buildroot}%{_bindir}
+
+mkdir -p %{buildroot}%{_sysconfdir}/openshift
+install -D -p -m 644 config/web-proxy-config.json %{buildroot}%{_sysconfdir}/openshift
+
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+install -D -p -m 644 config/logrotate.d/openshift-node-web-proxy %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+
+mkdir -p %{buildroot}%{nodejs_sitelib}/%{npm_name}
+install -D -p -m 644 index.js %{buildroot}%{nodejs_sitelib}/%{npm_name}
+install -D -p -m 644 README %{buildroot}%{nodejs_sitelib}/%{npm_name}
+
+mkdir -p %{buildroot}%{nodejs_sitelib}/%{npm_name}/lib
+install -D -p -m 644 lib/node-proxy.js %{buildroot}%{nodejs_sitelib}/%{npm_name}/lib
+
+mkdir -p %{buildroot}%{nodejs_sitelib}/%{npm_name}/lib/logger
+install -D -p -m 644 lib/logger/* %{buildroot}%{nodejs_sitelib}/%{npm_name}/lib/logger
+
+mkdir -p %{buildroot}%{nodejs_sitelib}/%{npm_name}/lib/proxy
+install -D -p -m 644 lib/proxy/* %{buildroot}%{nodejs_sitelib}/%{npm_name}/lib/proxy
+
+mkdir -p %{buildroot}%{nodejs_sitelib}/%{npm_name}/lib/utils
+install -D -p -m 644 lib/utils/* %{buildroot}%{nodejs_sitelib}/%{npm_name}/lib/utils
+
+mkdir -p %{buildroot}%{nodejs_sitelib}/%{npm_name}/lib/plugins
+install -D -p -m 644 lib/plugins/* %{buildroot}%{nodejs_sitelib}/%{npm_name}/lib/plugins
+
+mkdir -p %{buildroot}%{nodejs_sitelib}/%{npm_name}/bin
+install -D -p -m 755 bin/* %{buildroot}%{nodejs_sitelib}/%{npm_name}/bin
+
+mkdir -p %{buildroot}%{_var}/log/node-web-proxy
+if [ ! -f %{buildroot}%{_var}/log/node-web-proxy/supervisor.log ]; then
+ /bin/touch %{buildroot}%{_var}/log/node-web-proxy/supervisor.log
+fi
+
+%post
+%if %{with_systemd}
+/bin/systemctl --system daemon-reload
+%else
+/sbin/chkconfig --add openshift-node-web-proxy || :
+%endif
+
+%preun
+if [ "$1" -eq "0" ]; then
+%if %{with_systemd}
+ /bin/systemctl --no-reload disable openshift-node-web-proxy.service
+%else
+ /sbin/chkconfig --del openshift-node-web-proxy || :
+%endif
+fi
+
+
+%files
+%doc LICENSE
+%doc README
+%if %{with_systemd}
+%{_unitdir}/openshift-node-web-proxy.service
+%config(noreplace) %{_sysconfdir}/sysconfig/openshift-node-web-proxy
+%else
+%{_initddir}/openshift-node-web-proxy
+%endif
+%{_bindir}/node-find-proxy-route-files
+%config(noreplace) %{_sysconfdir}/openshift/web-proxy-config.json
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%dir %attr(-,apache,apache) %{_var}/log/node-web-proxy
+%ghost %attr(0660,root,root) %{_var}/log/node-web-proxy/supervisor.log
+%dir %{nodejs_sitelib}/%{npm_name}
+%{nodejs_sitelib}/%{npm_name}/*
+
+%changelog
+* Tue Aug 06 2013 Troy Dawson <tdawson at redhat.com> 1.11.1.1-3
+- Fixed LICENSE file inconsistency
+- added -p option to installing files
+- added comments about patches and LICENSE source
+
+* Tue Aug 06 2013 Troy Dawson <tdawson at redhat.com> 1.11.1.1-2
+- Rename logrotate file
+
+* Thu Aug 01 2013 Krishna Raman <kraman at gmail.com> 1.11.1.1-1
+- Bumping version #s for origin release 2 (kraman at gmail.com)
+
+* Tue Jun 25 2013 Adam Miller <admiller at redhat.com> 1.11.1-1
+- bump_minor_versions for sprint 30 (admiller at redhat.com)
+
+* Tue Jun 11 2013 Troy Dawson <tdawson at redhat.com> 1.10.2-1
+- Bump up version (tdawson at redhat.com)
+
+* Thu May 30 2013 Adam Miller <admiller at redhat.com> 1.10.1-1
+- bump_minor_versions for sprint 29 (admiller at redhat.com)
+
+* Fri May 24 2013 Adam Miller <admiller at redhat.com> 0.9.2-1
+- <node-proxy,port-proxy> Bug 964212 - Fix init script dependencies
+ (jdetiber at redhat.com)
+
+* Thu Apr 25 2013 Adam Miller <admiller at redhat.com> 0.9.1-1
+- Bug 928675 (asari.ruby at gmail.com)
+- bump_minor_versions for sprint 2.0.26 (tdawson at redhat.com)
+
+* Fri Apr 12 2013 Adam Miller <admiller at redhat.com> 0.8.2-1
+- We don't want the installation of the node-proxy to auto launch the service
+ (bleanhar at redhat.com)
+
+* Thu Mar 28 2013 Adam Miller <admiller at redhat.com> 0.8.1-1
+- bump_minor_versions for sprint 26 (admiller at redhat.com)
+
+* Thu Mar 21 2013 Adam Miller <admiller at redhat.com> 0.7.3-1
+- bug 922922 - change supervisor_log to supervisor.log for log rotation.
+ (rmillner at redhat.com)
+
+* Thu Mar 14 2013 Adam Miller <admiller at redhat.com> 0.7.2-1
+- Origin RHEL & Fedora build fixes. (rmillner at redhat.com)
+- use restart instead of reload. (blentz at redhat.com)
+- correct openshift-node-web-proxy logrotate to match all log files.
+ (blentz at redhat.com)
+
+* Thu Mar 07 2013 Adam Miller <admiller at redhat.com> 0.7.1-1
+- bump_minor_versions for sprint 25 (admiller at redhat.com)
+
+* Tue Mar 05 2013 Adam Miller <admiller at redhat.com> 0.6.6-1
+- BZ 905647: Push down cookies to ws lib. (mrunalp at gmail.com)
+
+* Fri Mar 01 2013 Adam Miller <admiller at redhat.com> 0.6.5-1
+- BZ914838: Fix uri parsing. (mrunalp at gmail.com)
+
+* Wed Feb 27 2013 Troy Dawson <tdawson at redhat.com> 0.6.4-2
+- set /etc/ files to be configs
+- remove duplication of permissions
+- set bin files to be executible
+
+* Tue Feb 26 2013 Adam Miller <admiller at redhat.com> 0.6.4-1
+- Skip migrated directories when finding the new routes. (rmillner at redhat.com)
+
+* Tue Feb 19 2013 Adam Miller <admiller at redhat.com> 0.6.3-1
+- Switch from VirtualHosts to mod_rewrite based routing to support high
+ density. (rmillner at redhat.com)
+
+* Fri Feb 08 2013 Adam Miller <admiller at redhat.com> 0.6.2-1
+- change %%define to %%global (tdawson at redhat.com)
+
+* Thu Feb 07 2013 Adam Miller <admiller at redhat.com> 0.6.1-1
+- bump_minor_versions for sprint 24 (admiller at redhat.com)
+
+* Wed Feb 06 2013 Adam Miller <admiller at redhat.com> 0.5.3-1
+- remove BuildRoot: (tdawson at redhat.com)
+- make Source line uniform among all spec files (tdawson at redhat.com)
+
+* Fri Feb 01 2013 Adam Miller <admiller at redhat.com> 0.5.2-1
+- Fix for node proxy file list getting truncated. (mrunalp at gmail.com)
+
+* Wed Jan 23 2013 Adam Miller <admiller at redhat.com> 0.5.1-1
+- bump_minor_versions for sprint 23 (admiller at redhat.com)
+
+* Mon Jan 21 2013 Adam Miller <admiller at redhat.com> 0.4.3-1
+- Cleanup init script display + handle "whacked" pids on restarts (stop).
+ (ramr at redhat.com)
+
+* Thu Jan 10 2013 Adam Miller <admiller at redhat.com> 0.4.2-1
+- Case-insensitive vhost routing support. (ramr at redhat.com)
+- Plugin work, rearrange bits, add help, fix spec file. (ramr at redhat.com)
+
+* Wed Dec 12 2012 Adam Miller <admiller at redhat.com> 0.4.1-1
+- bump_minor_versions for sprint 22 (admiller at redhat.com)
+
+* Wed Dec 12 2012 Adam Miller <admiller at redhat.com> 0.3.3-1
+- Fix for bugz 886668 - openshift-node-web-proxy sets incorrect header.
+ (ramr at redhat.com)
+
+* Tue Dec 11 2012 Adam Miller <admiller at redhat.com> 0.3.2-1
+- Merge pull request #1050 from ramr/master (openshift+bot at redhat.com)
+- Merge pull request #1045 from kraman/f17_fixes (openshift+bot at redhat.com)
+- Fix for bugz 885784 - run proxy as apache instead of root. (ramr at redhat.com)
+- Fix bugz - log to access.log + websockets.log + log file rollover. And update
+ idler's last access script to use the new node-web-proxy access.log file.
+ (ramr 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)
+
+* Mon Dec 10 2012 Adam Miller <admiller at redhat.com> 0.3.1-1
+- fix node-proxy versioning (admiller at redhat.com)
+
+* Tue Dec 04 2012 Ram Ranganathan <ramr at redhat.com> 0.3-1
+- Add empty readme file. (ramr at redhat.com)
+
+* Tue Dec 04 2012 Ram Ranganathan <ramr at redhat.com> 0.2-1
+- Rename to todo list. (ramr at redhat.com)
+
+* Fri Nov 30 2012 Ram Ranganathan <ramr at redhat.com> 0.1-1
+- new package built with tito
+
+
diff --git a/sources b/sources
index e69de29..54bf74b 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+30612103d45f4b0a4534360bc0844822 openshift-origin-node-proxy-1.11.1.1.tar.gz
More information about the scm-commits
mailing list