[PATCH] Create '/etc/yum/vars' if it doesn't exist
by James Laska
On older systems, /etc/yum/vars is not created by the yum package. In
fact, /etc/yum/vars isn't supported on older systems anyway. This patch
will optionally create /etc/yum/vars before setting releasever.
---
configserver/examples/katello-register.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/configserver/examples/katello-register.xml b/configserver/examples/katello-register.xml
index 7e55687..cc49e5a 100644
--- a/configserver/examples/katello-register.xml
+++ b/configserver/examples/katello-register.xml
@@ -205,6 +205,8 @@ def audrey_var(name, default=None):
def setup_releasever():
+ if not os.path.isdir('/etc/yum/vars'):
+ os.mkdir('/etc/yum/vars')
fp = open("/etc/yum/vars/releasever", "r+")
fp.write(audrey_var("RELEASEVER"))
fp.close()
--
1.7.7.6
10 years, 11 months
Re: Keepalive patch
by Jason Guiditta
Somehow I deleted this thread, so hopefully this gets attached right,
but ACK to the patch, seems to work fine.
-j
10 years, 11 months
You've been granted access to OpenShift!
by NoReply
Hello,
Thanks for signing up for OpenShift! Getting started is easy.
1. Go to the OpenShift console
2. Chose your Application Type
3. Name your Application and Namespace
4. Click on your URL
5. Congratulations, you're in the cloud!
Got questions? We are here to help!
Additional technical resources like user forums, blogs, KBs, documentation and videos are available on the OpenShift Community page.
Found a bug? Report it on Bugzilla!
Got a feature request? Post or vote it up!
Want to chat? You can find us on IRC at Freenode #openshift.
Thanks,
Jimmy Guerrero
Sr Product Market Manager / "PaaS Dude"
OpenShift | Red Hat
Forums: http://www.redhat.com/openshift/forums
Email: openshift(a)redhat.com
Twitter: @openshift
10 years, 11 months
[PATCH] BZ811373 - Add KeepAlive on to vhost in conductor.conf
by John Eckersberg
https://bugzilla.redhat.com/show_bug.cgi?id=811373
Note that the defaults for KeepAliveTimeout[1] and
MaxKeepAliveRequests[2] are 5 seconds and 100, respectively, which
should be fine for our purposes.
[1] http://httpd.apache.org/docs/2.2/mod/core.html#maxkeepaliverequests
[2] http://httpd.apache.org/docs/2.2/mod/core.html#keepalivetimeout
---
recipes/aeolus/files/aggregator-httpd-ssl.conf | 1 +
recipes/aeolus/files/aggregator-httpd.conf | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/recipes/aeolus/files/aggregator-httpd-ssl.conf b/recipes/aeolus/files/aggregator-httpd-ssl.conf
index 47f5aa0..b739317 100644
--- a/recipes/aeolus/files/aggregator-httpd-ssl.conf
+++ b/recipes/aeolus/files/aggregator-httpd-ssl.conf
@@ -5,6 +5,7 @@ NameVirtualHost *:443
TransferLog /etc/httpd/logs/access_log
LogLevel debug
+ KeepAlive On
ProxyRequests Off
RewriteEngine On
SSLEngine On
diff --git a/recipes/aeolus/files/aggregator-httpd.conf b/recipes/aeolus/files/aggregator-httpd.conf
index 19c56e7..36accad 100644
--- a/recipes/aeolus/files/aggregator-httpd.conf
+++ b/recipes/aeolus/files/aggregator-httpd.conf
@@ -5,6 +5,7 @@ NameVirtualHost *:80
TransferLog /etc/httpd/logs/access_log
LogLevel warn
+ KeepAlive On
ProxyRequests Off
RewriteEngine On
--
1.7.7.6
10 years, 11 months
[PATCH conductor] BZ #810404: Some GPL files that should be ASL
by Jason Guiditta
https://bugzilla.redhat.com/show_bug.cgi?id=810404
---
COPYING | 515 ++++++++++++++++------------------------------
aeolus-conductor.spec.in | 4 +-
2 files changed, 178 insertions(+), 341 deletions(-)
diff --git a/COPYING b/COPYING
index d511905..1a9893b 100644
--- a/COPYING
+++ b/COPYING
@@ -1,339 +1,176 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index ba26ee3..93af028 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -7,7 +7,7 @@ Release: 0%{?dist}
Summary: The Aeolus Conductor
Group: Applications/System
-License: GPLv2+ and MIT and BSD
+License: ASL 2.0 and MIT and BSD
URL: http://aeolusproject.org
# to build source tarball
@@ -55,7 +55,7 @@ The Aeolus Conductor, a web UI for managing cloud instances.
%package daemons
Summary: Aeolus Conductor daemons
Group: Applications/Internet
-License: GPLv2+
+License: ASL 2.0
Requires: %{name} = %{version}-%{release}
Requires: httpd >= 2.0
Requires: rubygem(thin) >= 1.2.5
--
1.7.7.6
10 years, 11 months
Image Management Engine
by Martyn Taylor
In the next iteration Image Factory aim to make significant improvements
and changes to its underlying model and its API. These changes will
remove any conductor specific content from image factory altogether.
You can find information on this here:
https://www.aeolusproject.org/redmine/projects/image-factory/wiki/V2_REST...
and here:
https://www.aeolusproject.org/redmine/projects/aeolus/wiki/Imagefactory_A...
In order to allow conductor API work and new imagefactory API
integration to work in parallel we will be implementing the image
management functionality as a rails engine. Information on rails engines
can be found here:
http://guides.rubyonrails.org/engines.html
This brings the project a host of benefits such as the ability to use
this as a standalone rails application offering a UI for managing Image
Factory directly and also to allow other rails applications to easily
integrate with image factory.
The engine is similar to a rails application which supplies all the
controllers, views, routes and generators for creating image factory
models. A prototype can be found here:
git(a)github.com
<mailto:git@github.com>:aeolus-incubator/image-management-engine.git
In the prototype are generators for creating the image management
models, controllers and views for managing CRUD operations on the models
and also the routes. Under the test folder is a dummy app that shows how
this engine could be integrated with conductor. Showing a simple example
on how to extend the engine models.
Cheers
Martyn
10 years, 11 months
RFC: Conductor - Provider / Provider Account API
by Petr Blaho
Hi,
this is just copy of https://www.aeolusproject.org/redmine/projects/aeolus/wiki/Feature_-_Prov...
Feature - Provider/Provider Account API
Summary
This feature will provide HTTP API for manipulating Provider and Provider Account resources in Conductor.
The standard set of actions includes CRUD - create, read, update and delete actions for Provider and Provider Account resources.
Owner
Petr Blaho
Current status
Currently there is an index action for both ProvidersController and ProviderAccountsController which responds to xml format.
This is used in Aeolus CLI tool.
Screencast Demo
TBD
Implementation tasks
#3080 - Umbrella task
#3108 - Ensure good test coverage for Providers / Provider Accounts Controller
#3121 - Implement basic CRUD for Provider and ProviderAccount API
Detailed description
Data structures, URL structure and Resource methods are similar to ones described in Conductor Image Management API.
TBD - examples of how to use API
High-level implementation details
I want to use Test Driven Development methods for this feature.
It will help me write all the tests needed for this feature.
It will help me with possible refactoring of controllers for Provider and Provider Account resources.
Future plan
Provider and Provider Account manipulation using Aeolus CLI tool.
References
v2 Conductor API Provider Management BDD
v2 Conductor API Provider Account Management BDD
Conductor Image Management API
--
With regards
Petr Blaho
10 years, 11 months
Feature: Better bundler/rpm (or any distro) integration
by Jason Guiditta
So, this is not a feature page right now, but it is a feature I have
been working on during my spare time, as it seems to be a recurring thorn
in our sides. The last time I looked into this, I sent a mail to list,
with mixed results:
https://fedorahosted.org/pipermail/aeolus-devel/2012-January/008014.html
Vit had some valid points, which I tried to take into consideration as
I rethought things a bit. My first inclination was to still move the
Gemfile and Gemfile.lock to be <$name>.in, and document the steps
needed depending on whether you were going to be developing in a
distro environment or as a pure ruby developer (or switching between
the two). I was well along this path, and had a couple rake tasks all
set to ease this process, which I was thinking would go in the (not
yet built) aeolus developer commandline tool (ccc or act, depending on
my mood that day). I was working through some issues that came up on
workflows I was expecting, such as rake failing, since the new developer
would not yet have the dependencies, but would have to run 'rake
dev:upstream' in order to then bundle install. Granted they could
just cp the files over themselves, but I wanted to add a simple
command to ease that. This too had fairly simple fixes (specify the
rake file to use when calling a task, wrap that in a shorter command),
but this seemed to indicate a recurring issue that I kept skirting
around.
Something Vit said in an earlier exchange hit it - 'you can
work with upstream ruby, or RPM-based systems, but not both, I am
afraid' (somewhat summarized quote). However, this did not sit well
with me, as not only do I want it to be easy for RPM distros to
package our stuff, but any other distro, whether I know anything about
said distro or not. Then I remembered this idea I had quite some time
ago to fix our 'temporary hack' of putting regular requires in the
application.rb that were basically duplicates of what we specified in
the Gemfile (which always grated on me, but I figured we'd fix it
eventually). The idea was some kind of 'shim layer' that would read
the Gemfile and create the requires for us. So now to revisit that
and present my results.
We have been using the above plus some hacks to the Gemfile (commented
out source, for instance), and an env var (USE_BUNDLER). We check
this var on startup, and only use bundler if it is 'yes'. This was
intended to make it easy to run as rpm, and possible, but not easy, to
run as a ruby developer. For the latter case you would have to set
your var to 'yes' _and_ uncomment the source line to properly bundle
install our app. This always struck me as suboptimal at best.
Shouldn't we be able to:
* Keep our deps in one place (ignoring the fact that they are
duplicated in rpm specs and such)
* Make it easy for upstream, while still not making it hard for
distros?
I thought the answer was 'yes', so I went rooting around in the
bundler code to see what I could find. Obviously the distro mentality
is opposite of bundler's view (which I think is equally valid and
actually makes a ton of sense in many other cases), but I had this idea
that maybe I could reuse something in bundler itself to enable my mad
scheme. After surprisingly little searching, I found a class called 'Dsl'.
No, I know what you are thinking, there was in fact no modem inside
this class! What there was, was a simple method that takes...(wait
for it) a gemfile, and parses it! This returns a list of Definition
objects, which in turn have names, which are what get used to require
the library (with the exception of gems who have a different name
needed to require them, like deltacloud for the deltacloud-client gem,
but that is handled too, via an 'autorequire' attr). So, there may be
some more hooks to find, but I think this is basically our solution.
I have started coding an Ext class with a Ext.system_require method,
and the basic idea seems to work. No lockfile is generated or used,
and we dont have to duplicate the requires in our application.rb.
Further, we could default our USE_BUNDLER to 'no' to ease upstream
dev, and simply set it in the initscripts for distros. The
application.rb would just check ENV var and do either a normal
Bundler.require, or our custom one. Note this code is not done, but
is far enough along that I am pretty confident it could be used. I was
hoping to have all this just be a patchset, but given my change of
directions, I couldn't quite get that together.
Now, here is an extra thought I had as I was about to start writing up
this proposal. Why not just make _bundler itself_ aware of the
USE_BUNDLER env var? Then _any_ app (or library) could stay with
their normal practice of using Bundler.require (guess it would have to
work with Bundler.setup too, to really be seemless) and get 'work on
any distro' for free (well, minus the packaging work, but this would
simplify that substanially as well, imo). I am not sure I would ever
be able to convince upstream bundler to take such an enhancement, but
perhaps if we had enough people that thought it was a good idea, then
maybe they would consider it. Anyway, once I have this mostly
working, I'll probably refactor it a bit to use Bunlder.require
instead of my current Bundler::Ext.system_require.
So what do you all think, am I certifiable (for this, not in general)?
Could it work? Are there some major issues I have totally missed or
forgotten here? Hopefully I have not forgotten an key details that
brought me to this (what seems like an) epiphany, but if I have,
perhaps questions will jar them from my addled brain. Ok, I can't
rattle on any longer, bring on the dissent!
-j
10 years, 11 months