fix assignation of postgresql_dburl, using a inexistant variable
remove duplicate definition of function ( since there is the exact
same code before in the file, with added debug statement )
fix and factorise the function for the list of users as openshift_users
do not match on the same exact list of people than valid_user ( due to code duplication
and subtle difference between the copies )
Bug 887353: removing a cartridge leaves info/ dir

This commit adds each cartridge's %{cartridgedir}/ directory as well as its
%{cartridgedir}/info/ directory to the %files stanza of the cartridge so
that RPM recognises these directories as belonging to the cartridge and
removes them when the RPMs are removed.

Following the example of the python-2.6 cartridge, which already has these
directories in its %files stanza, this commit uses %dir for the
%{cartridgedir}/ and %{cartridgedir}/info/.  We do need the default
permissions (0755) on these two directories so that the MCollective agent
can read the info/ directory.

This commit fixes Bug 887353.
US3205 - Adding restart functionality to UI
maintaining backward compatibility for rest application output
Switch calling convention to match US3143
Fix for bug 895441 - tightening our validations for cartridge scale factors
Merge pull request #1203 from rmillner/ssl-calling

Merged by openshift-bot
fix references to rhc app cartridge
Merge pull request #1210 from danmcp/master

Merged by openshift-bot
Removing the 'noreplace' macro from the development and production.rb for the console.

These are technically considered code for the Console so we do NOT want
'noreplace' set.  However, since rails developers have a tendency to modify
those files we are labeling them as configuration so that .rpmsave files will
be created whenever a new RPM overwrites changes that have been made.
%post script to fix the realm from any previous install.
separate out console and broker realms per BZ893369
BZ876324 resolve ServerName/NameVirtualHost situation for node/broker/ssl.conf

Conflicts:

	node/rubygem-openshift-origin-node.spec
BZ892909 copying the file to just modify it inplace is a waste of ressource, and a security problem, since the file /tmp/haproxy.cfg.$$ has a predictible name and there is no check to see if it already exist or if it was changed between sed and cat ( or cat and cp ). A attacker with access to /tmp could just create directory with the same name to create a DOS and erase haproxy configuration.

Signed-off-by: Chris Alfonso <calfonso@redhat.com>
BZ896406 - warning message when installing rubygem-openshift-origin-node

Conflicts:

	node/rubygem-openshift-origin-node.spec
BZ892990 - The server address should not be "localhost" on user account info page
BZ888056 - production.rb should not be marked as a conf file
create DnsService plugin using nsupdate