spacewalk/setup/bin/spacewalk-setup | 1 spacewalk/setup/lib/Spacewalk/Setup.pm | 166 +--- spacewalk/spacewalk-setup-embedded-postgresql/LICENSE | 339 ++++++++++ spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql | 63 + spacewalk/spacewalk-setup-embedded-postgresql/setup/defaults.d/embedded-postgresql.conf | 5 spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec | 45 + 6 files changed, 516 insertions(+), 103 deletions(-)
New commits: commit 8efc2da557e464ee90235ccb6276e2f44bf3912b Author: Michael Mraka michael.mraka@redhat.com Date: Mon Oct 22 16:12:35 2012 +0200
fixed script permission
diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec b/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec index bc9db35..28a9c53 100644 --- a/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec +++ b/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec @@ -23,8 +23,7 @@ installation of Spacewalk server. %install rm -rf %{buildroot} install -d -m 755 %{buildroot}/%{_bindir} -install -m 0644 bin/* %{buildroot}/%{_bindir} -chmod -R u+w %{buildroot}/%{_bindir}/* +install -m 0755 bin/* %{buildroot}/%{_bindir} install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d install -m 0644 setup/defaults.d/* %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/
@@ -39,8 +38,8 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE -%{_bindir}/spacewalk-setup-embedded-postgresql -%{_mandir}/man1/* +%attr(755,root,root) %{_bindir}/spacewalk-setup-embedded-postgresql +#%{_mandir}/man1/* %{_datadir}/spacewalk/setup/defaults.d/*
%changelog
commit dc6d96f692ab9302676f28c853b63af52072762a Author: Michael Mraka michael.mraka@redhat.com Date: Mon Oct 22 16:12:12 2012 +0200
added LICENSE
diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/LICENSE b/spacewalk/spacewalk-setup-embedded-postgresql/LICENSE new file mode 100644 index 0000000..d511905 --- /dev/null +++ b/spacewalk/spacewalk-setup-embedded-postgresql/LICENSE @@ -0,0 +1,339 @@ + 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.
commit b5310aff30874ef878fb8f294e2664cc5de84bfe Author: Michael Mraka michael.mraka@redhat.com Date: Mon Oct 22 16:11:28 2012 +0200
fixed rpm build issue
diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec b/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec index 9390283..bc9db35 100644 --- a/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec +++ b/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec @@ -22,6 +22,8 @@ installation of Spacewalk server.
%install rm -rf %{buildroot} +install -d -m 755 %{buildroot}/%{_bindir} +install -m 0644 bin/* %{buildroot}/%{_bindir} chmod -R u+w %{buildroot}/%{_bindir}/* install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d install -m 0644 setup/defaults.d/* %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/
commit 72c6162c2b8e32ed979a4310f7ddee91072d9508 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Oct 22 16:11:04 2012 +0200
added embedded postgresql installation part
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index aedd638..1e8308d 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -156,7 +156,6 @@ Spacewalk::Setup::system_or_exit(['/usr/sbin/spacewalk-service', 'restart'], 40, wait_for_tomcat($answers{hostname}) or exit 56;
Spacewalk::Setup::upgrade_stop_services(%opts); -Spacewalk::Setup::oracle_upgrade_start_db(%opts);
if ($opts{'upgrade'}) { print Spacewalk::Setup::loc("This portion of the $product_name upgrade process has successfully completed.\n"); diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index b777e0d..295befd 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -894,6 +894,7 @@ sub postgresql_setup_db { print Spacewalk::Setup::loc("** Database: Setting up database connection for PostgreSQL backend.\n"); my $connected;
+ postgresql_setup_embedded_db($opts, $answers); while (not $connected) { postgresql_get_database_answers($opts, $answers);
@@ -919,6 +920,69 @@ sub postgresql_setup_db { return 1; }
+sub postgresql_setup_embedded_db { + my $opts = shift; + my $answers = shift; + + if (not is_embedded_db($opts)) { + return 0; + } + + if ($opts->{'upgrade'}) { + # FIXME: upgrade code should go here + return 0; + } + + if ($opts->{"skip-db-install"} || $opts->{"upgrade"}) { + print loc("** Database: Embedded database installation SKIPPED.\n"); + + return 0; + } + + if (-d "/var/lib/pgsql/data/base") { + my $shared_dir = SHARED_DIR; + print loc(<<EOQ); +The embedded database appears to be already installed. Either rerun +this script with the --skip-db-install option, or use the +'$shared_dir/postgresql/remove-db.sh' script to remove the embedded database +and try again. +EOQ + + exit 13; + } + + if (not $opts->{"skip-db-diskspace-check"}) { + system_or_exit(['python', SHARED_DIR . + '/embedded_diskspace_check.py'], 14, + 'There is not enough space available for the embedded database.'); + } + else { + print loc("** Database: Embedded database diskspace check SKIPPED!\n"); + } + + printf loc(<<EOQ, DB_INSTALL_LOG_FILE); +** Database: Installing the database: +** Database: This is a long process that is logged in: +** Database: %s +EOQ + + if (have_selinux()) { + local *X; open X, '>', DB_INSTALL_LOG_FILE and close X; + system('/sbin/restorecon', DB_INSTALL_LOG_FILE); + } + print_progress(-init_message => "*** Progress: #", + -log_file_name => DB_INSTALL_LOG_FILE, + -log_file_size => DB_INSTALL_LOG_SIZE, + -err_message => "Could not install database.\n", + -err_code => 15, + -system_opts => [ "/usr/bin/spacewalk-setup-embedded-postgresql", "--db", $answers->{'db-name'}, + "--user", $answers->{'db-user'}, "--password", $answers->{'db-password'}]); + + print loc("** Database: Installation complete.\n"); + + return 1; +} + sub postgresql_populate_db { my $opts = shift; my $answers = shift; @@ -1055,24 +1119,12 @@ sub oracle_setup_db { oracle_check_for_users_and_groups($opts);
print loc("* Setting up database.\n"); - oracle_setup_embedded_db($opts, $answers); oracle_setup_db_connection($opts, $answers); oracle_test_db_settings($opts, $answers); write_rhn_conf($answers, 'db-backend', 'db-name', 'db-user', 'db-password'); oracle_populate_db($opts, $answers); }
-sub oracle_upgrade_start_db { - my $opts = shift; - if (is_embedded_db($opts)) { - if ($opts->{'upgrade'}) { - system_or_exit(['/sbin/service', 'oracle', 'start'], 19, - 'Could not start the oracle database service.'); - } - } - - return; -}
sub oracle_check_for_users_and_groups { my $opts = shift; @@ -1085,96 +1137,6 @@ sub oracle_check_for_users_and_groups { } }
-sub oracle_setup_embedded_db { - my $opts = shift; - my $answers = shift; - - if (not is_embedded_db($opts)) { - return 0; - } else { - $answers->{'db-user'} = 'rhnsat' if not defined $answers->{'db-user'}; - $answers->{'db-password'} = 'rhnsat' if not defined $answers->{'db-password'}; - $answers->{'db-name'} = 'rhnsat' if not defined $answers->{'db-name'}; - $answers->{'db-host'} = 'localhost'; - $answers->{'db-port'} = 1521; - } - - - if ($opts->{'upgrade'}) { - printf loc(<<EOQ, DB_UPGRADE_LOG_FILE); -** Database: Upgrading the database server to latest Oracle 10g: -** Database: This is a long process that is logged in: -** Database: %s -EOQ - print_progress(-init_message => "*** Progress: #", - -log_file_name => DB_UPGRADE_LOG_FILE, - -log_file_size => DB_UPGRADE_LOG_SIZE, - -err_message => "Could not upgrade database.\n", - -err_code => 15, - -system_opts => ['/sbin/runuser', 'oracle', '-c', - SHARED_DIR . '/oracle/upgrade-db.sh' . - " --db $answers->{'db-name'}" . - " --user $answers->{'db-user'}"]); - - system_or_exit(['service', 'oracle', 'restart'], 41, - 'Could not restart oracle service'); - - return 0; - } - - if ($opts->{"skip-db-install"} || $opts->{"upgrade"}) { - print loc("** Database: Embedded database installation SKIPPED.\n"); - - return 0; - } - - if (-d "/rhnsat/data") { - my $shared_dir = SHARED_DIR; - print loc(<<EOQ); -The embedded database appears to be already installed. Either rerun -this script with the --skip-db-install option, or use the -'$shared_dir/oracle/remove-db.sh' script to remove the embedded database and try -again. -EOQ - - exit 13; - } - - if (not $opts->{"skip-db-diskspace-check"}) { - system_or_exit(['python', SHARED_DIR . - '/embedded_diskspace_check.py'], 14, - 'There is not enough space available for the embedded database.'); - } - else { - print loc("** Database: Embedded database diskspace check SKIPPED!\n"); - } - - printf loc(<<EOQ, DB_INSTALL_LOG_FILE); -** Database: Installing the database: -** Database: This is a long process that is logged in: -** Database: %s -EOQ - - if (have_selinux()) { - local *X; open X, '>', DB_INSTALL_LOG_FILE and close X; - system('/sbin/restorecon', DB_INSTALL_LOG_FILE); - } - print_progress(-init_message => "*** Progress: #", - -log_file_name => DB_INSTALL_LOG_FILE, - -log_file_size => DB_INSTALL_LOG_SIZE, - -err_message => "Could not install database.\n", - -err_code => 15, - -system_opts => [ SHARED_DIR . "/oracle/install-db.sh", "--db", $answers->{'db-name'}, - "--user", $answers->{'db-user'}, "--password", $answers->{'db-password'}]); - - print loc("** Database: Installation complete.\n"); - - sleep(5); # We need to sleep because sometimes the database doesn't - # come back up fast enough. - - return 1; -} - sub oracle_setup_db_connection { my $opts = shift; my $answers = shift;
commit 2ebc5e0406b0470e7d1d647dd9a2f6b8843dfb04 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Oct 22 16:10:27 2012 +0200
included defaults.d in rpm
diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec b/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec index 6bb43c4..9390283 100644 --- a/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec +++ b/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec @@ -22,10 +22,9 @@ installation of Spacewalk server.
%install rm -rf %{buildroot} -chmod -R u+w %{buildroot}/* -#install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/ -#install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/jabberd -#install -m 0644 share/jabberd/* %{buildroot}/%{_datadir}/spacewalk/setup/jabberd/ +chmod -R u+w %{buildroot}/%{_bindir}/* +install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d +install -m 0644 setup/defaults.d/* %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/
%check @@ -40,7 +39,6 @@ rm -rf %{buildroot} %doc LICENSE %{_bindir}/spacewalk-setup-embedded-postgresql %{_mandir}/man1/* -%dir %{_datadir}/spacewalk -%{_datadir}/spacewalk/* +%{_datadir}/spacewalk/setup/defaults.d/*
%changelog
commit f8b6849b90695845390dfaeeb3a2c78de15039e8 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Oct 22 16:09:41 2012 +0200
default database connect information
diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/setup/defaults.d/embedded-postgresql.conf b/spacewalk/spacewalk-setup-embedded-postgresql/setup/defaults.d/embedded-postgresql.conf new file mode 100644 index 0000000..54874d5 --- /dev/null +++ b/spacewalk/spacewalk-setup-embedded-postgresql/setup/defaults.d/embedded-postgresql.conf @@ -0,0 +1,5 @@ +db-name = rhnschema +db-user = rhnuser +db-password = rhnpw +db-host = +db-port =
commit 09f0e06d5e4880b2fbf85667fa19e27fe5e89877 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Oct 22 16:09:36 2012 +0200
script for initial setup of embedded postgresql database
diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql b/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql new file mode 100755 index 0000000..3de5d8c --- /dev/null +++ b/spacewalk/spacewalk-setup-embedded-postgresql/bin/spacewalk-setup-embedded-postgresql @@ -0,0 +1,63 @@ +#!/bin/bash + +set -e + +OPTS=$(getopt --longoptions=db:,user:,password: -n ${0##*/} -- d:u:p "$@") + +if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi + +eval set -- "$OPTS" + +while true ; do + case "$1" in + -d|--db) + PGNAME=$2 + shift + ;; + -u|--user) + PGUSER=$2 + shift + ;; + -p|--password) + PGPASSWORD=$2 + shift + ;; + --) + shift + break + ;; + *) + echo "Internal error [$1]!" >&2 + exit 1 + ;; + esac + shift +done + +if [ -z "$PGUSER" -o -z "$PGPASSWORD" -o -z "$PGNAME" ] ; then + echo "usage: $(basename $0) --db <database_name> --user <username> --password <password>" >&2 + exit 1 +fi + +chkconfig postgresql on +service postgresql initdb +service postgresql start + +su - postgres <<EOP +PGPASSWORD='$PGPASSWORD' +createdb '$PGNAME' +createlang plpgsql '$PGNAME' +yes '$PGPASSWORD' | createuser -P -sDR '$PGUSER' +EOP + +PG_HBA=/var/lib/pgsql/data/pg_hba.conf +sed -i 's/^([^#].*)$/### next line has been commented out by spacewalk-setup-embedded-postgresql: ###\n##\1/ ' $PG_HBA +cat >> $PG_HBA <<EOF + +local $PGNAME $PGUSER md5 +host $PGNAME $PGUSER 127.0.0.1/8 md5 +host $PGNAME $PGUSER ::1/128 md5 +local $PGNAME postgres ident +EOF + +service postgresql reload diff --git a/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec b/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec new file mode 100644 index 0000000..6bb43c4 --- /dev/null +++ b/spacewalk/spacewalk-setup-embedded-postgresql/spacewalk-setup-embedded-postgresql.spec @@ -0,0 +1,46 @@ +Name: spacewalk-setup-embedded-postgresql +Version: 0.1 +Release: 1%{?dist} +Summary: Tools to setup embedded PostgreSQL database for Spacewalk +Group: Applications/System +License: GPLv2 +URL: https://fedorahosted.org/spacewalk +Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +Requires: postgresql-server > 8.4 + +%description +Script, which setup embedded PostgreSQL database for Spacewalk. Used during +installation of Spacewalk server. + +%prep +%setup -q + + +%build + +%install +rm -rf %{buildroot} +chmod -R u+w %{buildroot}/* +#install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/ +#install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/jabberd +#install -m 0644 share/jabberd/* %{buildroot}/%{_datadir}/spacewalk/setup/jabberd/ + + +%check + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc LICENSE +%{_bindir}/spacewalk-setup-embedded-postgresql +%{_mandir}/man1/* +%dir %{_datadir}/spacewalk +%{_datadir}/spacewalk/* + +%changelog
spacewalk-commits@lists.fedorahosted.org