[Fusionforge-commits] r8729 - in trunk: . gforge gforge/db gforge/etc

Christian Bayle cbayle at libremir.placard.fr.eu.org
Sun Feb 7 16:28:26 CET 2010


Author: cbayle
Date: 2010-02-07 16:28:26 +0100 (Sun, 07 Feb 2010)
New Revision: 8729

Added:
   trunk/gforge/fusionforge-install-1-deps.php
   trunk/gforge/fusionforge-install-2.php
   trunk/gforge/fusionforge-install-3-db.php
Removed:
   trunk/gforge/gforge-install-1-deps.php
   trunk/gforge/gforge-install-2.php
   trunk/gforge/gforge-install-3-db.php
Modified:
   trunk/
   trunk/gforge/INSTALL.TXT
   trunk/gforge/db/gforge.sql
   trunk/gforge/etc/local.inc.example
   trunk/gforge/install.sh
Log:
Get svn merge



Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674,7699,7746-7748,7771,7774,7786,7838
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7478,7480,7485,7490-7492,7505,7540,7556-7560,7568,7570-7571,7573,7576,7580,7609-7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7742,7760,7763-7764,7767,7769-7770,7773,7776,7784-7785,7791,7797,7799,7802-7808,7810-7811,7816,7818,7825-7828,7839,7846-7847,7850,7894,7902,7920-7922,7927-7928,7932,7936-7937,7939,7942,7944-7945,7947,7951,7956,7958,7960,8064,8079-8080,8108,8113,8119,8121,8127-8128,8145,8197,8201-8202,8216,8224,8226,8228,8247-8250,8252,8271-8272,8310-8311,8328,8337,8339-8357,8361,8371,8373-8375,8378-8379,8383-8396,8415,8427-8428,8429-8431,8438-8441,8449,8452-8453,8458,8461,8477-8478,8480,8482,8492,8514,8530,8604-8605,8608,8637

   + /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674,7699,7746-7748,7771,7774,7786,7838
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7478,7480,7485,7490-7492,7505,7540,7556-7560,7568,7570-7571,7573,7576,7580,7609-7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7742,7760,7763-7764,7767,7769-7770,7773,7776,7784-7785,7791,7797,7799,7802-7808,7810-7811,7816,7818,7825-7828,7839,7846-7847,7850,7894,7902,7920-7922,7927-7928,7932,7936-7937,7939,7942,7944-7945,7947,7951,7956,7958,7960,8064,8079-8080,8108,8113,8119,8121,8127-8128,8145,8197,8201-8202,8216,8224,8226,8228,8247-8250,8252,8271-8272,8310-8311,8328,8337,8339-8357,8361,8371,8373-8375,8378-8379,8383-8396,8415,8427-8428,8429-8431,8438-8441,8449,8452-8453,8458,8461,8477-8478,8480,8482,8492,8514,8530,8604-8605,8608,8637
/trunk:8721-8727

Modified: svk:merge
   - 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7623
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7624
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7838
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7560
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7580
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7615
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7618
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7622
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7626
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7708
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7713
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7725
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7730
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7732
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7734
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7737
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7739
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7760
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7763
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7764
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7767
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7773
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7776
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7784
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7797
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7799
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7811
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7826
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7827
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7828
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7839
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7951
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7958
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8108
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8145
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8216
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8226
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8250
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8337
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8357
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8371
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8375
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8379
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8415
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8431
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8441
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8449
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8453
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8530
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8604
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8605
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8608
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8637

   + 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7623
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7624
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7838
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7560
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7580
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7615
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7618
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7622
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7626
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7708
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7713
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7725
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7730
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7732
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7734
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7737
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7739
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7760
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7763
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7764
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7767
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7773
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7776
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7784
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7797
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7799
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7811
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7826
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7827
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7828
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7839
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7951
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7958
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8108
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8145
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8216
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8226
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8250
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8337
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8357
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8371
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8375
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8379
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8415
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8431
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8441
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8449
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8453
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8530
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8604
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8605
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8608
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8637
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/trunk:8727


Modified: trunk/gforge/INSTALL.TXT
===================================================================
--- trunk/gforge/INSTALL.TXT	2010-02-07 15:28:17 UTC (rev 8728)
+++ trunk/gforge/INSTALL.TXT	2010-02-07 15:28:26 UTC (rev 8729)
@@ -148,8 +148,8 @@
 
 The following are sample commands commonly issued for a manual installation:
 
-tar -xjf gforge-4.7.tar.bz2
-cd gforge-4.7
+tar -xjf gforge-X.X.tar.bz2
+cd gforge-X.X
 
 #
 #	BEFORE RUNNING THIS, determine your apacheuser/group 

Modified: trunk/gforge/db/gforge.sql
===================================================================
--- trunk/gforge/db/gforge.sql	2010-02-07 15:28:17 UTC (rev 8728)
+++ trunk/gforge/db/gforge.sql	2010-02-07 15:28:26 UTC (rev 8729)
@@ -7892,3 +7892,35 @@
 WITH OIDS;
 -- ALTER TABLE artifact_workflow_notify OWNER TO gforge;
 
+
+--
+-- Name: database_changes; Type: TABLE; Schema: public; Owner: gforge; Tablespace:
+--
+
+CREATE TABLE database_changes (
+    filename text
+);
+
+
+ALTER TABLE public.database_changes OWNER TO gforge;
+
+--
+-- Name: database_startpoint; Type: TABLE; Schema: public; Owner: gforge; Tablespace:
+--
+
+CREATE TABLE database_startpoint (
+    db_version character varying(10),
+    db_start_date integer
+);
+
+
+ALTER TABLE public.database_startpoint OWNER TO gforge;
+
+--
+-- Data for Name: database_startpoint; Type: TABLE DATA; Schema: public; Owner: gforge
+--
+
+COPY database_startpoint (db_version, db_start_date) FROM stdin;
+4.8.50	20090507
+\.
+

Modified: trunk/gforge/etc/local.inc.example
===================================================================
--- trunk/gforge/etc/local.inc.example	2010-02-07 15:28:17 UTC (rev 8728)
+++ trunk/gforge/etc/local.inc.example	2010-02-07 15:28:26 UTC (rev 8729)
@@ -20,20 +20,19 @@
 // FusionForge hostnames
 //
 // Hostnames should be fully qualified domain names (FQDNs); using short names
-// would be prettier but would stop you from distributing your SourceForge
-// implementation across multiple domains.
+// would be prettier but would stop you from distributing your implementation
+// across multiple domains.
 //
 // Of course, if you have a lot of machines serving a particular purpose
 // such as FTP or for shell accounts, the "hostname" here might be in
 // reality an addr_list of machines that is serviced by a round-robin
 // mechanism or something fancy like a local-director.
 //
-// The default GForge domain
-// this is used where ever the "naked" form of the GForge domain
+// The default FusionForge domain
+// this is used where ever the "naked" form of the FusionForge domain
 // might be used.  E.g., "mailto:admin at gforge.net"
 $sys_default_domain = 'gforge.company.com';
 $sys_forum_return_domain = "gforge.company.com";
-//$sys_fallback_domain = 'gforge2.company.com';
 
 // Machine used for downloading sources/packages
 $sys_download_host = 'download.gforge.company.com';
@@ -153,11 +152,11 @@
 $sys_use_survey=true;
 $sys_use_frs=true;
 $sys_use_fti=false;
-$sys_use_ftp=true;
+$sys_use_ftp=false;
 $sys_use_trove=true;
-$sys_use_snippet=true;
+$sys_use_snippet=false;
 $sys_use_ssl=false;
-$sys_use_people=true;
+$sys_use_people=false;
 $sys_use_shell=true;
 $sys_use_private_project=true;
 $sys_use_diary=true;
@@ -173,7 +172,7 @@
 $sys_use_gateways=true;
 
 // Enable/Disable the ability to add additionnal vhost for a project
-$sys_use_project_vhost=true;
+$sys_use_project_vhost=false;
 // Enable/Disable the ability to have database for a project (backend not implemented)
 $sys_use_project_database=false;
 // Enable/Disable the ability to add images for a project (frontend not implemented)

Copied: trunk/gforge/fusionforge-install-1-deps.php (from rev 8727, trunk/gforge/fusionforge-install-1-deps.php)
===================================================================
--- trunk/gforge/fusionforge-install-1-deps.php	                        (rev 0)
+++ trunk/gforge/fusionforge-install-1-deps.php	2010-02-07 15:28:26 UTC (rev 8729)
@@ -0,0 +1,188 @@
+#!/usr/bin/php
+<?php
+/**
+ * FusionForge Installation Dependency Setup
+ *
+ * Copyright 2006 GForge, LLC
+ * http://gforge.org/
+ *
+ * @version
+ *
+ * This file is part of GInstaller. It is be called by install.sh.
+ *
+ * GForge 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.
+ *
+ * GForge 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 GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  US
+ * Francisco Gimeno
+ */
+
+define ("VERBOSE", TRUE);
+define ("GREEN", "\033[01;32m" );
+define ("NORMAL", "\033[00m" );
+define ("RED", "\033[01;31m" );
+
+function printUsage() {
+	echo "Usage: fusionforge-install-1-deps [RHEL4|RHEL5|DEBIAN|FEDORA|CENTOS|ARK|SUSE|OPENSUSE]\n";
+}
+
+function INFO($message)
+{
+    global $depth, $myLog;
+    if(VERBOSE) for ($i=0; $i < $depth; $i++) echo " ";
+        if(VERBOSE) echo $message;
+    for($i=0; $i < $depth; $i++ ) $myLog.=" ";
+    $myLog.=$message;
+}
+
+function installRedhat() {
+	addFusionForgeYumRepo();
+	addDagRPMForgeYumRepo();
+	INFO("Installing packages: Executing YUM. Please wait...\n\n\n");
+	passthru("yum -y install httpd php mailman cvs postgresql postgresql-libs postgresql-server postgresql-contrib perl-URI php-pgsql subversion mod_dav_svn postfix rcs php-gd mod_ssl wget openssh which liberation-fonts htmlpurifier php-mbstring poppler-utils php-pecl-zip antiword");
+}
+
+function installRHEL4() {
+	INFO("Installing packages: Executing UP2DATE. Please wait...\n\n\n");
+	passthru("up2date --install php php-gd php-pgsql mailman postgresql-server postgresql-contrib rcs cvs httpd subversion perl-URI mod_dav_svn ssh postfix mod_ssl wget");
+	INFO(RED."You Must Install htmlpurifier manually.");
+}
+
+function installDebian() {
+
+	INFO("Installing Packages with apt-get");
+	passthru("apt-get -y install apache2 php5 php5-cli php5-pgsql cvs postgresql postgresql-contrib libipc-run-perl liburi-perl libapache2-svn libapache2-mod-php5 subversion subversion-tools php5-curl curl ssh lsb-release");
+
+	INFO(RED."You Must Install Mailman Manually: apt-get install mailman postfix");
+}
+
+function installSUSE() {
+
+	INFO("Installing Packages with yast");
+	passthru("yast -i apache2-prefork php mailman cvs postgresql postgresql-libs postgresql-server postgresql-contrib perl-URI php4-pgsql subversion apache-mod_dav_svn ssh postfix rcs php4-gd mod_ssl perl-IPC-Run php4-curl wget subversion-server apache2-mod_php4");
+
+	INFO("Fixing php4 installation");
+	passthru("cp /usr/lib/apache2-prefork/libphp4.so /usr/lib/apache2/mod_php.so");
+
+	INFO("Restarting APACHE");
+	passthru("/etc/init.d/apache2 start");
+	passthru("/etc/init.d/apache2 stop");
+
+	INFO("Restarting PostgreSQL");
+	passthru("/etc/init.d/postgresql stop");
+	passthru("/etc/init.d/postgresql start");
+
+	INFO("Starting Apache");
+	passthru("/etc/init.d/apache2 start");
+
+	INFO(RED."You Must Install htmlpurifier manually.");
+}
+
+function installOPENSUSE() {
+
+	INFO("Installing Packages with yast");
+	passthru("yast -i apache2-prefork apache2-mod_php5 cvs mailman perl-IPC-Run perl-URI php5 php5-curl php5-gd php5-gettext php5-pgsql postfix postgresql postgresql-contrib postgresql-libs postgresql-server rcs openssh subversion subversion-server wget viewvc");
+
+	INFO("Restarting PostgreSQL...");
+	passthru("rcpostgresql restart");
+	INFO("Restarting Apache...");
+	passthru("rcapache2 restart");
+
+	INFO(RED."You Must Install htmlpurifier manually.");
+}
+
+function installArk() {
+	INFO("Installing packages: Executing apt-get. Please wait...\n\n\n");
+	passthru("apt-get update");
+	passthru("apt-get -y install httpd php mailman cvs postgresql postgresql-libs postgresql-server postgresql-contrib perl-URI php-pgsql subversion subversion-server-httpd postfix rcs mod_ssl wget ssh");
+
+	INFO("Restarting PostgreSQL\n");
+	passthru("/sbin/service postgresql restart");
+
+	INFO(RED."You Must Install htmlpurifier manually.");
+}
+
+function addFusionForgeYumRepo() {
+	INFO("Adding FusionForge YUM repository\n");
+
+	if (getenv('FFORGE_RPM_REPO')) {
+		$rpm_repo = getenv('FFORGE_RPM_REPO');
+	} else {
+//		$rpm_repo = 'http://fusionforge.org/rpm/';
+		$rpm_repo = 'http://buildbot.fusionforge.org/job/fusionforge-trunk-full/ws/build/packages/';
+	}
+
+	$repo = '
+# Name: FusionForge RPM Repository
+# URL: http://fusionforge.org/
+[fusionforge]
+name = Red Hat Enterprise $releasever - fusionforge.org
+baseurl = '.$rpm_repo.'
+enabled = 1
+protect = 0
+gpgcheck = 0';
+	file_put_contents('/etc/yum.repos.d/fusionforge.repo', $repo);
+}
+function addDagRPMForgeYumRepo() {
+	INFO("Adding Dag RPMForge YUM repository\n");
+	$repo = '
+# Name: RPMforge RPM Repository for Red Hat Enterprise 5 - dag
+# URL: http://rpmforge.net/
+[dag-rpmforge]
+name = Red Hat Enterprise $releasever - RPMforge.net - dag
+baseurl = http://apt.sw.be/redhat/el5/en/$basearch/dag
+#mirrorlist = http://apt.sw.be/redhat/el5/en/mirrors-rpmforge
+enabled = 1
+protect = 0
+gpgcheck = 0';
+	file_put_contents('/etc/yum.repos.d/dag-rpmforge.repo', $repo);
+}
+
+if (count($argv) < 2) {
+	if ( is_file('/etc/SuSE-release') ) {
+		if ( exec('grep openSUSE /etc/SuSE-release') ) {
+			$platform = 'OPENSUSE';
+			echo "detected OPENSUSE platform\n";
+		} else {
+			$platform = 'SUSE';
+			echo "detected SUSE platform\n";
+		}
+	} else {
+		printUsage();
+	}
+} else {
+	if ($argv[1] == '-h' || $argv[1] == '--help') {
+		printUsage();
+		exit();
+	} else {
+		$platform = $argv[1];
+		echo "setting up dependencies for $platform\n";
+	}
+}
+
+if ($platform == 'FEDORA' || $platform == 'CENTOS' || $platform == 'RHEL5') {
+	installRedhat();
+} elseif ($platform == 'RHEL4') {
+	installRHEL4();
+} elseif ($platform == 'DEBIAN') {
+	installDebian(); /* Debian and friends */
+} elseif ($platform == 'SUSE') {
+	installSUSE();
+} elseif ($platform == 'OPENSUSE') {
+	installOPENSUSE();
+} elseif ($platform == 'ARK') {
+	installArk();
+} else {
+	echo 'UNSUPPORTED PLATFORM\n';
+}
+
+?>


Property changes on: trunk/gforge/fusionforge-install-1-deps.php
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Copied: trunk/gforge/fusionforge-install-2.php (from rev 8727, trunk/gforge/fusionforge-install-2.php)
===================================================================
--- trunk/gforge/fusionforge-install-2.php	                        (rev 0)
+++ trunk/gforge/fusionforge-install-2.php	2010-02-07 15:28:26 UTC (rev 8729)
@@ -0,0 +1,251 @@
+#!/usr/bin/php
+<?php
+/**
+ * FusionForge Installation Dependency Setup
+ *
+ * Copyright 2006 GForge, LLC
+ * http://gforge.org/
+ *
+ * @version
+ *
+ * This file is part of GInstaller, it is called by install.sh.
+ *
+ * GForge 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.
+ *
+ * GForge 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 GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  US
+ * Francisco Gimeno
+ */
+
+	define ('GREEN', "\033[01;32m" );
+	define ('NORMAL', "\033[00m" );
+	define ('RED', "\033[01;31m" );
+
+	$args = $_SERVER['argv'];
+
+	echo "Validating arguments  ";
+	if (count($args) != 4) {
+		echo "FAIL\n  Usage: $args[0]  gforge.company.com  apacheuser  apachegroup\n";
+		exit(127);
+	}
+	echo "OK\n";
+
+	//validate hostname
+	echo "Validating hostname  ";
+	if (!preg_match("/^([[:alnum:]._-])*$/" , $args[1])) {
+		echo "FAIL\n  invalid hostname\n";
+		exit(2);
+	}
+	echo "OK\n";
+
+	// #validate apache user
+	//getent passwd $2 > /dev/null
+	//found_apacheuser=$?
+	//if [ $found_apacheuser -ne 0 ]; then
+	//	echo 1>&2 "invalid apache user"
+	//	exit 2
+	//fi
+
+	//ARREGLAR ESTO
+	exec("getent passwd $args[2] > /dev/null", $arr, $t);
+	if ($t != 0) {
+	 	echo "invalid apache user\n";
+	 	exit(2);
+	}
+
+
+
+
+	// #validate apache group
+	//getent group $3 > /dev/null
+	//found_apachegroup=$?
+	//if [ $found_apachegroup -ne 0 ]; then
+	//     echo 1>&2 "invalid apache group"
+	//     exit 2
+	//fi
+	
+
+	exec("getent group $args[3] > /dev/null", $arr, $t);
+	if ($t != 0) {
+	 	echo "invalid apache group";
+	 	exit(2);
+	}
+
+	echo "Creating /opt/gforge  ";
+	system("mkdir -p /opt/gforge");
+	if (!is_dir("/opt/gforge"))
+	{
+		echo "FAIL\n  /opt/gforge didn't exist - error - make sure you've got permission";
+		exit(2);
+	}
+	echo "OK\n";
+
+	echo "Creating /var/lib/gforge  ";
+	system("mkdir -p /var/lib/gforge  ");
+	if (!is_dir("/var/lib/gforge"))
+	{
+		echo "FAIL\n  /var/lib/gforge didn't exist - error - make sure you've got permission";
+		exit(2);
+	}
+	echo "OK\n";
+
+
+	system("cp -r * /opt/gforge");
+
+	chdir("/var/lib/gforge");
+	system("mkdir -p uploads");
+	system("mkdir -p scmtarballs");
+	system("mkdir -p scmsnapshots");
+
+	//#project vhost space
+	system("mkdir -p homedirs");
+	system("mkdir -p /home/groups");
+	if (!is_dir("homedirs/groups"))
+	{
+		symlink("/home/groups", "homedirs/groups");
+	}
+
+	// Create default location for SVN repositories
+	system("mkdir -p svnroot");
+	if (!is_dir("/svnroot"))
+	{
+		symlink("/var/lib/gforge/svnroot", "/svnroot");
+	}
+
+	// Create default location for CVS repositories
+	system("mkdir -p cvsroot");
+	if (!is_dir("/cvsroot"))
+	{
+		symlink("/var/lib/gforge/cvsroot", "/cvsroot");
+	}
+
+	// Create default dumps dir
+	system("mkdir -p /var/lib/gforge/dumps");
+
+	//cd /opt/gforge
+	chdir("/opt/gforge");
+
+	//#restricted shell for cvs accounts
+	//echo "linea 1\n";
+	system("cp plugins/scmcvs/bin/cvssh.pl /bin/");
+	//echo "linea 2\n";
+	system("chmod 755 /bin/cvssh.pl");
+
+	// Create default location for gforge config files
+	system("mkdir -p /etc/gforge");
+	if (!is_file("/etc/gforge/local.inc")) {
+		system("cp etc/local.inc.example /etc/gforge/local.inc");
+	}
+	if (!is_file("/etc/gforge/httpd.conf")) {
+		system("cp etc/gforge-httpd.conf.example /etc/gforge/httpd.conf");
+	}
+
+	system("mkdir -p /etc/gforge/httpd.d");
+	system("cp plugins/*/etc/httpd.d/*.conf /etc/gforge/httpd.d");
+
+	// Install default configuration files for all plugins.
+	system("mkdir -p /etc/gforge/plugins/");
+	chdir("/opt/gforge/plugins");
+	foreach( glob("*") as $plugin) {
+		$source = "/opt/gforge/plugins/$plugin/etc/plugins/$plugin";
+		if (is_dir($source)) {
+			system("cp -r $source /etc/gforge/plugins/");
+		}
+	}
+
+	$apacheconffiles=array();
+	if (is_file('/etc/httpd/conf/httpd.conf')) {
+		$apacheconffiles[]='/etc/httpd/conf/httpd.conf';
+	} elseif (is_file('/opt/csw/apache2/etc/httpd.conf')) {
+		$apacheconffiles[]='/opt/csw/apache2/etc/httpd.conf';
+	} elseif (is_file('/etc/apache2/httpd.conf')) {
+		$apacheconffiles[]='/etc/apache2/httpd.conf';
+	} else {
+		$apacheconffiles[]='/etc/apache2/sites-enabled/000-default';
+	}
+
+	foreach ($apacheconffiles as $apacheconffile) {
+		echo('Setting FusionForge Include For Apache...');
+		system("grep \"^Include /etc/gforge/httpd.conf\" $apacheconffile > /dev/null", $ret);
+		if ($ret == 1) {
+			system("echo \"Include /etc/gforge/httpd.conf\" >> $apacheconffile");
+		}
+	}
+
+	// Create symlink for the wiki plugin.
+	if (!is_dir("/opt/gforge/www/wiki"))
+	{
+		symlink ("../plugins/wiki/www/", "/opt/gforge/www/wiki");
+	}
+
+	//#symlink plugin www's
+	//cd /opt/gforge/www
+	chdir("/opt/gforge/www");
+	if (!is_dir("plugins"))
+	{
+		system("mkdir -p plugins");
+	}
+
+	chdir("plugins");
+	if (!is_dir("cvstracker"))
+	{
+		symlink ("../../plugins/cvstracker/www/", "cvstracker");
+	}
+	if (!is_dir("svntracker"))
+	{
+		symlink ("../../plugins/svntracker/www/", "svntracker");
+	}
+	if (!is_dir("scmcvs"))
+	{
+		symlink ("../../plugins/scmcvs/www", "scmcvs");
+	}
+	if (!is_dir("fckeditor"))
+	{
+		symlink ("../../plugins/fckeditor/www", "fckeditor");
+	}
+
+	//cd /opt/gforge
+	chdir("/opt/gforge");
+	system("chown -R root:$args[3] /opt/gforge");
+	system("chmod -R 644 /opt/gforge/");
+	system("cd /opt/gforge && find -type d | xargs chmod 755");
+	system("chown -R $args[2]:$args[3] /var/lib/gforge/uploads");
+	system("chmod -R 755 /opt/gforge/cronjobs/");
+	system("chmod 755 /opt/gforge/www/scm/viewvc/bin/cgi/viewvc.cgi");
+	
+	if (!is_dir("/etc/gforge"))
+	{
+		echo "/etc/gforge didn't exist - error - make sure you've got permission";
+		exit(2);
+	}
+	system("chown -R root:$args[3] /etc/gforge/");
+	system("chmod -R 644 /etc/gforge/");
+	system("cd /etc/gforge && find -type d | xargs chmod 755");
+	system("cd /etc/gforge && find -type f -exec perl -pi -e \"s/apacheuser/$args[2]/\" {} \;");
+	system("cd /etc/gforge && find -type f -exec perl -pi -e \"s/apachegroup/$args[3]/\" {} \;");
+	system("cd /etc/gforge && find -type f -exec perl -pi -e \"s/gforge\.company\.com/$args[1]/\" {} \;");
+	system("echo \"noreply:	/dev/null\" >> /etc/aliases");
+
+	# Generate a random hash for the session_key
+	$hash = md5(microtime());
+	system("perl -spi -e \"s/sys_session_key = 'foobar'/sys_session_key = '$hash'/\" /etc/gforge/local.inc");
+
+	# Use liberation fonts if jpgraph provided in the archive.
+	if (is_dir("/opt/gforge/jpgraph")) {
+		system("perl -spi -e \"s!//(.gantt_title_font_family)='FF_ARIAL';!\\$1='FF_LIBERATION_SANS';!\" /etc/gforge/local.inc");
+		system("perl -spi -e \"s!//(.gantt_title_font_style=.*)!\\$1!\" /etc/gforge/local.inc");
+		system("perl -spi -e \"s!//(.gantt_title_font_size=.*)!\\$1!\" /etc/gforge/local.inc");
+		system("perl -spi -e \"s!//(.gantt_task_font_family)='FF_ARIAL';!\\$1='FF_LIBERATION_SANS';!\" /etc/gforge/local.inc");
+		system("perl -spi -e \"s!//(.gantt_task_font_style=.*)!\\$1!\" /etc/gforge/local.inc");
+		system("perl -spi -e \"s!//(.gantt_task_font_size=.*)!\\$1!\" /etc/gforge/local.inc");
+	}
+	print "\n";


Property changes on: trunk/gforge/fusionforge-install-2.php
___________________________________________________________________
Added: svn:executable
   + *

Copied: trunk/gforge/fusionforge-install-3-db.php (from rev 8727, trunk/gforge/fusionforge-install-3-db.php)
===================================================================
--- trunk/gforge/fusionforge-install-3-db.php	                        (rev 0)
+++ trunk/gforge/fusionforge-install-3-db.php	2010-02-07 15:28:26 UTC (rev 8729)
@@ -0,0 +1,420 @@
+#!/usr/bin/php
+<?php
+/**
+ * FusionForge Installation Dependency Setup
+ *
+ * Copyright 2006 GForge, LLC
+ * http://gforge.org/
+ *
+ * @version
+ *
+ * This file is part of GInstaller, it is called by install.sh.
+ *
+ * GForge 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.
+ *
+ * GForge 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 GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  US
+ * Francisco Gimeno
+ */
+
+define ('GREEN', "\033[01;32m" );
+define ('NORMAL', "\033[00m" );
+define ('RED', "\033[01;31m" );
+
+$STDOUT = fopen('php://stdout','w');
+$STDIN = fopen('php://stdin','r');
+
+show("\n-=# Welcome to FusionForge DB-Installer #=-");
+
+//TO DO: add dependency check
+//if (!run("php check-deps.php", true)) {
+//	echo RED.'Not all the necessary dependencies were found. aborting.'.NORMAL."\n";
+//	exit(1);
+//}
+
+// Make sure the DB is initialized by starting postgresql service
+if (is_file('/etc/init.d/postgresql')) 
+{
+	$pgservice='/etc/init.d/postgresql';
+} 
+elseif (is_file('/etc/init.d/postgresql-8.2'))
+{
+	$pgservice='/etc/init.d/postgresql-8.2';
+} 
+elseif (is_file('/etc/init.d/postgresql-8.3'))
+{
+	$pgservice='/etc/init.d/postgresql-8.3';
+}
+elseif (is_file('/etc/init.d/cswpostgres'))
+{
+	$pgservice='/etc/init.d/cswpostgres';
+}
+else
+{
+	die("ERROR: Could not find Postgresql init script\n");
+}
+
+# Fedora9 (an maybe newer) requires running initdb
+if ($pgservice == '/etc/init.d/postgresql') {
+	if (!is_dir("/var/lib/pgsql/data/base")) {
+		run("service postgresql initdb &>/dev/null", true);
+	}
+}
+
+// Might fail if it's already running, so we'll ingnore the result
+run("$pgservice start", true);
+
+// Where the PHP code will live
+//$gforge_lib_dir = '/opt/gforge5';   //CAMBIE ESTO
+$gforge_lib_dir = '/opt/gforge';
+
+if (!is_dir($gforge_lib_dir))
+{
+	die("Error: GForge folder doesn't exist. Run fusionforge-install-2.php first.");
+}
+
+
+// Where the configuration files will live
+$gforge_etc_dir = getenv('GFORGE_ETC_DIR');
+if (empty($gforge_etc_dir))
+{
+	$gforge_etc_dir = '/etc/gforge';
+}
+
+// Where the PGHBA config file is
+if (is_file("/var/lib/pgsql/data/pg_hba.conf"))
+{
+	// RedHat & SuSE
+	$PGHBA='/var/lib/pgsql/data/pg_hba.conf';
+}
+elseif (is_file('/etc/postgresql/8.2/main/pg_hba.conf'))
+{
+	$PGHBA='/etc/postgresql/8.2/main/pg_hba.conf';
+}
+elseif (is_file('/opt/csw/var/pgdata/pg_hba.conf'))
+{
+	$PGHBA='/opt/csw/var/pgdata/pg_hba.conf';
+}
+else
+{
+	die("ERROR: Could not find pg_hba.conf file\n");
+}
+
+
+if (is_file('/usr/share/pgsql/contrib/tsearch2.sql'))
+{
+	// RedHat
+	$tsearch2_sql='/usr/share/pgsql/contrib/tsearch2.sql';
+}
+elseif (is_file('/usr/share/postgresql/contrib/tsearch2.sql'))
+{
+	// SuSE
+	$tsearch2_sql='/usr/share/postgresql/contrib/tsearch2.sql';
+}
+elseif (is_file('/usr/share/postgresql/8.2/contrib/tsearch2.sql'))
+{
+	$tsearch2_sql='/usr/share/postgresql/8.2/contrib/tsearch2.sql';
+}
+elseif (is_file('/opt/csw/postgresql/share/contrib/tsearch2.sql'))
+{
+	// Solaris 10
+	$tsearch2_sql='/opt/csw/postgresql/share/contrib/tsearch2.sql';
+}
+else
+{
+	die("ERROR: Could not find tsearch2.sql file\n");
+}
+
+
+function install()
+{
+	global $PGHBA, $gforge_lib_dir, $gforge_etc_dir, $tsearch2_sql, $pgservice, $STDIN, $STDOUT;
+
+	show("\n * Enter the Database Name (gforge): ");
+
+	if (getenv('FFORGE_DB')) {
+		$gforge_db = getenv('FFORGE_DB');
+	} else {
+		$gforge_db = trim(fgets($STDIN));
+		if (strlen($gforge_db) == 0) {
+			$gforge_db = 'gforge';
+		}
+	}
+	show(" ...using '$gforge_db'");
+
+	show(' * Enter the Database Username (gforge): ');
+
+	if (getenv('FFORGE_USER')) {
+		$gforge_user = getenv('FFORGE_USER');
+	} else {
+		$gforge_user = trim(fgets($STDIN));
+		if (strlen($gforge_user) == 0) {
+			$gforge_user = 'gforge';
+		}
+	}
+	show(" ...using '$gforge_user'");
+
+	show(" * Modifying DB Access Permissions...");
+	if (!file_exists("$PGHBA.fforge.backup")) {
+		run("cp $PGHBA $PGHBA.fforge.backup", true);
+	}
+	run("echo \"# GFORGE\nlocal all all trust\" > $PGHBA");
+	show(' * Restarting PostgreSQL...');
+	run("$pgservice stop", true);
+	run("$pgservice start");
+
+
+	show(" * Creating '$gforge_user' Group...");
+	run("/usr/sbin/groupadd $gforge_user", true);
+
+	show(" * Creating '$gforge_user' User...");
+	run("/usr/sbin/useradd -g $gforge_user $gforge_user", true);
+
+	show(" * Creating Database User '$gforge_user'...");
+	run("su - postgres -c \"createuser -A -R -d -E $gforge_user\"", true);
+
+	show(' * Creating Language...');
+	run("su - postgres -c \"createlang plpgsql template1\"", true);
+
+	if (!is_dir("/home/$gforge_user")) {
+	    $susufix = '';
+	} else {
+	    $susufix = '-';
+	}
+
+	show(" * Creating '$gforge_db' Database...");
+	run("su $susufix $gforge_user -c \"createdb --encoding UNICODE $gforge_db\"", true);
+
+	# Detect postgresql version, load tsearch2 for pg < 8.3
+	$pg_version = explode(' ', shell_exec("postgres --version"));
+	$pgv = $pg_version[2];
+
+	if (preg_match('/^(7\.|8\.1|8\.2)/', $pgv)) {
+		show(" * Dumping tsearch2 Database Into '$gforge_db' DB");
+		run("su - postgres -c \"psql $gforge_db < $tsearch2_sql\" >> /tmp/gforge-import.log");
+
+		$tables = array('pg_ts_cfg', 'pg_ts_cfgmap', 'pg_ts_dict', 'pg_ts_parser');
+		foreach ($tables as $table) {
+			run('su - postgres -c "psql '.$gforge_db.' -c \\"GRANT ALL on '.$table.' TO '.$gforge_user.';\\""');
+		}
+//	} else {
+//		show(" * Creating FTS default configuation (Full Text Search)");
+//		run("su - postgres -c \"psql $gforge_db < $gforge_lib_dir/db/FTS-20081108.sql\" >> /tmp/gforge-import.log");
+	}
+
+
+	show(' * Dumping FusionForge DB');
+	run("su $susufix $gforge_user -c \"psql $gforge_db < $gforge_lib_dir/db/gforge.sql\" >> /tmp/gforge-import.log");
+
+//	show(' * Dumping FusionForge FTI DB');
+//	run("su $susufix $gforge_user -c \"psql $gforge_db < $gforge_lib_dir/db/FTI.sql\" >> /tmp/gforge-import.log");
+//	run("su $susufix $gforge_user -c \"psql $gforge_db < $gforge_lib_dir/db/FTI-20050315.sql\" >> /tmp/gforge-import.log");
+//	run("su $susufix $gforge_user -c \"psql $gforge_db < $gforge_lib_dir/db/FTI-20050401.sql\" >> /tmp/gforge-import.log");
+//	run("su $susufix $gforge_user -c \"psql $gforge_db < $gforge_lib_dir/db/FTI-20050530.sql\" >> /tmp/gforge-import.log");
+//	run("su $susufix $gforge_user -c \"psql $gforge_db < $gforge_lib_dir/db/FTI-20060130.sql\" >> /tmp/gforge-import.log");
+//	run("su $susufix $gforge_user -c \"psql $gforge_db < $gforge_lib_dir/db/FTI-20061025.sql\" >> /tmp/gforge-import.log");
+
+	show(" * Enter the Admin Username (fforgeadmin): ");
+	if (getenv('FFORGE_ADMIN_USER')) {
+		$admin_user = getenv('FFORGE_ADMIN_USER');
+	} else {
+		$admin_user = trim(fgets($STDIN));
+
+		if (strlen($admin_user) == 0) {
+			$admin_user = 'fforgeadmin';
+		}
+	}
+	show(" ...using '$admin_user'");
+
+	if (getenv('FFORGE_ADMIN_PASSWORD')) {
+		$bad_pwd = false;
+		$pwd1 = getenv('FFORGE_ADMIN_PASSWORD');
+	} else {
+		$retries = 0;
+		$bad_pwd = true;
+		$pwd1 = '';
+		$pwd2 = '';
+		$error = '';
+		while ($bad_pwd && $retries < 5) {
+			if ($bad_pwd && $retries > 0) {
+				show(' * ' . $error);
+			}
+			$pwd1 = readMasked(" * Enter the Site Admin Password:");
+			$error = validatePassword($pwd1);
+			if ($error != '') {
+				$bad_pwd = true;
+			} else {
+				$pwd2 = readMasked(" * Please enter it again: \n");
+				if ($pwd1 == $pwd2) {
+					$bad_pwd = false;
+				} else {
+					$error = 'Passwords don\'t match. Please try again.';
+				}
+			}
+			$retries++;
+		}
+	}
+
+	if ($bad_pwd) {
+		show('Passwords didn\'t match! Aborting.');
+		die();
+	} else {
+		$pw_md5 = md5($pwd1);
+		$pw_crypt = crypt($pwd1);
+		$pw_crypt = str_replace('$', '\\\\\\$', $pw_crypt);
+		//run(	'su - postgres -c "psql ' . 
+		//	$gforge_db . 
+		//	' -c \\"UPDATE \\\\\"user\\\\\" SET unix_name=\'' . 
+		//	$admin_user . '\', password_md5=\'' . 
+		//	$pw_md5 . '\', password_crypt=\'' . 
+		//	$pw_crypt . '\' WHERE user_id=101;\\""'); // MODIFIQUE ESTO
+
+		//run(	'su - postgres -c "psql ' . 
+		//	$gforge_db . 
+		//	' -c \\"UPDATE \\\\\"users\\\\\" SET user_name=\'' . 
+		//	$admin_user . '\', user_pw=\'' . 
+		//	$pw_md5 . '\', unix_pw=\'' . 
+		//	$pw_crypt . '\' WHERE user_id=101;\\""');
+//echo "BREAKPOINT 1\n";
+//$t = trim(fgets($STDIN));
+
+//	run("su - postgres -c \"psql $gforge_db -c \\\"INSERT INTO users (user_name, user_pw, unix_pw) VALUES ('$admin_user', '$pw_md5', '$pw_crypt')\\\"\"");
+	run("su - postgres -c \"psql $gforge_db -c \\\"INSERT INTO users (user_name, email, user_pw, unix_pw, status, theme_id) VALUES ('$admin_user', 'root at localhost.localdomain', '$pw_md5', '$pw_crypt', 'A', 1); INSERT INTO user_group (user_id, group_id, admin_flags) VALUES (currval('users_pk_seq'), 1, 'A')\\\"\"");
+
+//echo "BREAKPOINT 2\n";
+//$t = trim(fgets($STDIN));
+
+//	run("su - postgres -c \"psql $gforge_db -c \\\"INSERT INTO user_group (user_id, group_id, admin_flags) VALUES (currval('users_pk_seq'), 1, 'A')\\\"\"" );
+
+//echo "BREAKPOINT 3\n";
+//$t = trim(fgets($STDIN));
+
+	}
+	if (!is_dir($gforge_etc_dir)) {
+		mkdir($gforge_etc_dir);
+	}
+
+
+	show(' * Saving database configuration in FForge config file');
+	$data = file_get_contents("$gforge_etc_dir/local.inc");
+	$lines = explode("\n",$data);
+	$config = '';
+	foreach ($lines as $l) {
+		$l = preg_replace("/^.sys_dbname\s*=\s*'(.*)'/", "\$sys_dbname='$gforge_db'", $l);
+		$l = preg_replace("/^.sys_dbuser\s*=\s*'(.*)'/", "\$sys_dbuser='$gforge_user'", $l);
+		$config .= $l."\n";
+	}
+
+	if ($fp = fopen("$gforge_etc_dir/local.inc", "w")) {
+		fwrite ($fp, $config);
+		fclose($fp);	
+	}
+
+	show(' * Saving installation log in /tmp/gforge-import.log');
+}
+/*
+function uninstall() {
+	global $PGHBA, $gforge_lib_dir, $gforge_var_dir, $gforge_etc_dir, $gforge_db, $gforge_user, $tsearch2_sql;
+
+	show(" * Removing DATABASE \n";
+	system("su - $gforge_user -c \"dropdb $gforge_db\"", $ret );
+	show(" done . ($ret)\n";
+
+	show(" * Removing Language \n";
+	system("su - postgres -c \"droplang plpgsql template1\"", $ret );
+	show(" done. ($ret)\n";
+
+	show(" * Removing GForge DATABASE User: \n";
+	system("su - postgres -c \"dropuser $gforge_user\"", $ret );
+	show(" done.($ret)");
+
+	show(" * Removing GForge User: \n";
+	system("userdel $gforge_user");
+	show(" done.");
+
+	show(" * Restoring $PGHBA file: ... ";
+	system("cp $PGHBA.gforge.backup $PGHBA");
+	show(" done.");
+
+	show(" * Restarting PostgreSQL: ...\n";
+	system("/etc/init.d/postgresql restart");
+	show(" done.");
+}
+*/
+
+function validatePassword($password) {
+	if (strlen($password)<6) {
+		return 'Password is too short. Please try again.';
+	}
+	if (!preg_match('/[[:alnum:]]*/', $password)) {
+		return 'Password contains invalid characters. Please try again.';
+	}
+	return '';
+}
+
+function readMasked($prompt) {
+	global $STDIN;
+	if (strtolower(php_uname('s')) == 'sunos') {
+	    show($prompt);
+	    $text_entered = fgets($STDIN);
+	} else {
+	    $options="-er -s -p";
+	    $returned=popen("read $options \"".GREEN.$prompt.NORMAL."\n\"; echo \$REPLY", 'r');
+	    $text_entered=fgets($returned, 100);
+	    pclose($returned);
+	    $text_entered=substr($text_entered, 0, strlen($text_entered));
+	    @ob_flush();
+	    flush();
+	}
+	return trim($text_entered);
+}
+
+function finish() {
+	show(NORMAL."Done.\nYou are ready to run install-gforge-3.php");
+}
+
+function show($text, $newLine = true) {
+	global $STDOUT;
+
+	$hd = fopen ("/tmp/gforge-import.log", "a+");
+	fwrite($hd, "*** $text\n");
+	fclose($hd);
+
+	if ($newLine) {
+		$text = GREEN.$text .NORMAL."\n";
+	}
+	fwrite($STDOUT, $text);
+}
+
+function run($command, $ignore = false) {
+
+	$hd = fopen ("/tmp/gforge-import.log", "a+");
+	fwrite($hd, "CMD ".$command."\n");
+	fclose($hd);
+
+	system($command, $ret);
+	if ($ignore) {
+		if ($ret != 0) {
+			return false;
+		} else {
+			return true;
+		}
+	} else {
+		if ($ret != 0) {
+			echo RED.'An error ocurred running the last command... aborting.'.NORMAL."\n";
+			die();
+		}
+	}
+}
+
+install();
+?>


Property changes on: trunk/gforge/fusionforge-install-3-db.php
___________________________________________________________________
Added: svn:executable
   + *

Deleted: trunk/gforge/gforge-install-1-deps.php
===================================================================
--- trunk/gforge/gforge-install-1-deps.php	2010-02-07 15:28:17 UTC (rev 8728)
+++ trunk/gforge/gforge-install-1-deps.php	2010-02-07 15:28:26 UTC (rev 8729)
@@ -1,188 +0,0 @@
-#!/usr/bin/php
-<?php
-/**
- * FusionForge Installation Dependency Setup
- *
- * Copyright 2006 GForge, LLC
- * http://gforge.org/
- *
- * @version
- *
- * This file is part of GInstaller. It is be called by install.sh.
- *
- * GForge 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.
- *
- * GForge 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 GForge; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  US
- * Francisco Gimeno
- */
-
-define ("VERBOSE", TRUE);
-define ("GREEN", "\033[01;32m" );
-define ("NORMAL", "\033[00m" );
-define ("RED", "\033[01;31m" );
-
-function printUsage() {
-	echo "Usage: gforge-install-1-deps [RHEL4|RHEL5|DEBIAN|FEDORA|CENTOS|ARK|SUSE|OPENSUSE]\n";
-}
-
-function INFO($message)
-{
-    global $depth, $myLog;
-    if(VERBOSE) for ($i=0; $i < $depth; $i++) echo " ";
-        if(VERBOSE) echo $message;
-    for($i=0; $i < $depth; $i++ ) $myLog.=" ";
-    $myLog.=$message;
-}
-
-function installRedhat() {
-	addFusionForgeYumRepo();
-	addDagRPMForgeYumRepo();
-	INFO("Installing packages: Executing YUM. Please wait...\n\n\n");
-	passthru("yum -y install httpd php mailman cvs postgresql postgresql-libs postgresql-server postgresql-contrib perl-URI php-pgsql subversion mod_dav_svn postfix rcs php-gd mod_ssl wget openssh which liberation-fonts htmlpurifier php-mbstring poppler-utils php-pecl-zip antiword");
-}
-
-function installRHEL4() {
-	INFO("Installing packages: Executing UP2DATE. Please wait...\n\n\n");
-	passthru("up2date --install php php-gd php-pgsql mailman postgresql-server postgresql-contrib rcs cvs httpd subversion perl-URI mod_dav_svn ssh postfix mod_ssl wget");
-	INFO(RED."You Must Install htmlpurifier manually.");
-}
-
-function installDebian() {
-
-	INFO("Installing Packages with apt-get");
-	passthru("apt-get -y install apache2 php5 php5-cli php5-pgsql cvs postgresql postgresql-contrib libipc-run-perl liburi-perl libapache2-svn libapache2-mod-php5 subversion subversion-tools php5-curl curl ssh lsb-release");
-
-	INFO(RED."You Must Install Mailman Manually: apt-get install mailman postfix");
-}
-
-function installSUSE() {
-
-	INFO("Installing Packages with yast");
-	passthru("yast -i apache2-prefork php mailman cvs postgresql postgresql-libs postgresql-server postgresql-contrib perl-URI php4-pgsql subversion apache-mod_dav_svn ssh postfix rcs php4-gd mod_ssl perl-IPC-Run php4-curl wget subversion-server apache2-mod_php4");
-
-	INFO("Fixing php4 installation");
-	passthru("cp /usr/lib/apache2-prefork/libphp4.so /usr/lib/apache2/mod_php.so");
-
-	INFO("Restarting APACHE");
-	passthru("/etc/init.d/apache2 start");
-	passthru("/etc/init.d/apache2 stop");
-
-	INFO("Restarting PostgreSQL");
-	passthru("/etc/init.d/postgresql stop");
-	passthru("/etc/init.d/postgresql start");
-
-	INFO("Starting Apache");
-	passthru("/etc/init.d/apache2 start");
-
-	INFO(RED."You Must Install htmlpurifier manually.");
-}
-
-function installOPENSUSE() {
-
-	INFO("Installing Packages with yast");
-	passthru("yast -i apache2-prefork apache2-mod_php5 cvs mailman perl-IPC-Run perl-URI php5 php5-curl php5-gd php5-gettext php5-pgsql postfix postgresql postgresql-contrib postgresql-libs postgresql-server rcs openssh subversion subversion-server wget viewvc");
-
-	INFO("Restarting PostgreSQL...");
-	passthru("rcpostgresql restart");
-	INFO("Restarting Apache...");
-	passthru("rcapache2 restart");
-
-	INFO(RED."You Must Install htmlpurifier manually.");
-}
-
-function installArk() {
-	INFO("Installing packages: Executing apt-get. Please wait...\n\n\n");
-	passthru("apt-get update");
-	passthru("apt-get -y install httpd php mailman cvs postgresql postgresql-libs postgresql-server postgresql-contrib perl-URI php-pgsql subversion subversion-server-httpd postfix rcs mod_ssl wget ssh");
-
-	INFO("Restarting PostgreSQL\n");
-	passthru("/sbin/service postgresql restart");
-
-	INFO(RED."You Must Install htmlpurifier manually.");
-}
-
-function addFusionForgeYumRepo() {
-	INFO("Adding FusionForge YUM repository\n");
-
-	if (getenv('FFORGE_RPM_REPO')) {
-		$rpm_repo = getenv('FFORGE_RPM_REPO');
-	} else {
-//		$rpm_repo = 'http://fusionforge.org/rpm/';
-		$rpm_repo = 'http://buildbot.fusionforge.org/job/fusionforge-trunk-full/ws/build/packages/';
-	}
-
-	$repo = '
-# Name: FusionForge RPM Repository
-# URL: http://fusionforge.org/
-[fusionforge]
-name = Red Hat Enterprise $releasever - fusionforge.org
-baseurl = '.$rpm_repo.'
-enabled = 1
-protect = 0
-gpgcheck = 0';
-	file_put_contents('/etc/yum.repos.d/fusionforge.repo', $repo);
-}
-function addDagRPMForgeYumRepo() {
-	INFO("Adding Dag RPMForge YUM repository\n");
-	$repo = '
-# Name: RPMforge RPM Repository for Red Hat Enterprise 5 - dag
-# URL: http://rpmforge.net/
-[dag-rpmforge]
-name = Red Hat Enterprise $releasever - RPMforge.net - dag
-baseurl = http://apt.sw.be/redhat/el5/en/$basearch/dag
-#mirrorlist = http://apt.sw.be/redhat/el5/en/mirrors-rpmforge
-enabled = 1
-protect = 0
-gpgcheck = 0';
-	file_put_contents('/etc/yum.repos.d/dag-rpmforge.repo', $repo);
-}
-
-if (count($argv) < 2) {
-	if ( is_file('/etc/SuSE-release') ) {
-		if ( exec('grep openSUSE /etc/SuSE-release') ) {
-			$platform = 'OPENSUSE';
-			echo "detected OPENSUSE platform\n";
-		} else {
-			$platform = 'SUSE';
-			echo "detected SUSE platform\n";
-		}
-	} else {
-		printUsage();
-	}
-} else {
-	if ($argv[1] == '-h' || $argv[1] == '--help') {
-		printUsage();
-		exit();
-	} else {
-		$platform = $argv[1];
-		echo "setting up dependencies for $platform\n";
-	}
-}
-
-if ($platform == 'FEDORA' || $platform == 'CENTOS' || $platform == 'RHEL5') {
-	installRedhat();
-} elseif ($platform == 'RHEL4') {
-	installRHEL4();
-} elseif ($platform == 'DEBIAN') {
-	installDebian(); /* Debian and friends */
-} elseif ($platform == 'SUSE') {
-	installSUSE();
-} elseif ($platform == 'OPENSUSE') {
-	installOPENSUSE();
-} elseif ($platform == 'ARK') {
-	installArk();
-} else {
-	echo 'UNSUPPORTED PLATFORM\n';
-}
-
-?>

Deleted: trunk/gforge/gforge-install-2.php
===================================================================
--- trunk/gforge/gforge-install-2.php	2010-02-07 15:28:17 UTC (rev 8728)
+++ trunk/gforge/gforge-install-2.php	2010-02-07 15:28:26 UTC (rev 8729)
@@ -1,251 +0,0 @@
-#!/usr/bin/php
-<?php
-/**
- * FusionForge Installation Dependency Setup
- *
- * Copyright 2006 GForge, LLC
- * http://gforge.org/
- *
- * @version
- *
- * This file is part of GInstaller, it is called by install.sh.
- *
- * GForge 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.
- *
- * GForge 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 GForge; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  US
- * Francisco Gimeno
- */
-
-	define ('GREEN', "\033[01;32m" );
-	define ('NORMAL', "\033[00m" );
-	define ('RED', "\033[01;31m" );
-
-	$args = $_SERVER['argv'];
-
-	echo "Validating arguments  ";
-	if (count($args) != 4) {
-		echo "FAIL\n  Usage: $args[0]  gforge.company.com  apacheuser  apachegroup\n";
-		exit(127);
-	}
-	echo "OK\n";
-
-	//validate hostname
-	echo "Validating hostname  ";
-	if (!preg_match("/^([[:alnum:]._-])*$/" , $args[1])) {
-		echo "FAIL\n  invalid hostname\n";
-		exit(2);
-	}
-	echo "OK\n";
-
-	// #validate apache user
-	//getent passwd $2 > /dev/null
-	//found_apacheuser=$?
-	//if [ $found_apacheuser -ne 0 ]; then
-	//	echo 1>&2 "invalid apache user"
-	//	exit 2
-	//fi
-
-	//ARREGLAR ESTO
-	exec("getent passwd $args[2] > /dev/null", $arr, $t);
-	if ($t != 0) {
-	 	echo "invalid apache user\n";
-	 	exit(2);
-	}
-
-
-
-
-	// #validate apache group
-	//getent group $3 > /dev/null
-	//found_apachegroup=$?
-	//if [ $found_apachegroup -ne 0 ]; then
-	//     echo 1>&2 "invalid apache group"
-	//     exit 2
-	//fi
-	
-
-	exec("getent group $args[3] > /dev/null", $arr, $t);
-	if ($t != 0) {
-	 	echo "invalid apache group";
-	 	exit(2);
-	}
-
-	echo "Creating /opt/gforge  ";
-	system("mkdir -p /opt/gforge");
-	if (!is_dir("/opt/gforge"))
-	{
-		echo "FAIL\n  /opt/gforge didn't exist - error - make sure you've got permission";
-		exit(2);
-	}
-	echo "OK\n";
-
-	echo "Creating /var/lib/gforge  ";
-	system("mkdir -p /var/lib/gforge  ");
-	if (!is_dir("/var/lib/gforge"))
-	{
-		echo "FAIL\n  /var/lib/gforge didn't exist - error - make sure you've got permission";
-		exit(2);
-	}
-	echo "OK\n";
-
-
-	system("cp -r * /opt/gforge");
-
-	chdir("/var/lib/gforge");
-	system("mkdir -p uploads");
-	system("mkdir -p scmtarballs");
-	system("mkdir -p scmsnapshots");
-
-	//#project vhost space
-	system("mkdir -p homedirs");
-	system("mkdir -p /home/groups");
-	if (!is_dir("homedirs/groups"))
-	{
-		symlink("/home/groups", "homedirs/groups");
-	}
-
-	// Create default location for SVN repositories
-	system("mkdir -p svnroot");
-	if (!is_dir("/svnroot"))
-	{
-		symlink("/var/lib/gforge/svnroot", "/svnroot");
-	}
-
-	// Create default location for CVS repositories
-	system("mkdir -p cvsroot");
-	if (!is_dir("/cvsroot"))
-	{
-		symlink("/var/lib/gforge/cvsroot", "/cvsroot");
-	}
-
-	// Create default dumps dir
-	system("mkdir -p /var/lib/gforge/dumps");
-
-	//cd /opt/gforge
-	chdir("/opt/gforge");
-
-	//#restricted shell for cvs accounts
-	//echo "linea 1\n";
-	system("cp plugins/scmcvs/bin/cvssh.pl /bin/");
-	//echo "linea 2\n";
-	system("chmod 755 /bin/cvssh.pl");
-
-	// Create default location for gforge config files
-	system("mkdir -p /etc/gforge");
-	if (!is_file("/etc/gforge/local.inc")) {
-		system("cp etc/local.inc.example /etc/gforge/local.inc");
-	}
-	if (!is_file("/etc/gforge/httpd.conf")) {
-		system("cp etc/gforge-httpd.conf.example /etc/gforge/httpd.conf");
-	}
-
-	system("mkdir -p /etc/gforge/httpd.d");
-	system("cp plugins/*/etc/httpd.d/*.conf /etc/gforge/httpd.d");
-
-	// Install default configuration files for all plugins.
-	system("mkdir -p /etc/gforge/plugins/");
-	chdir("/opt/gforge/plugins");
-	foreach( glob("*") as $plugin) {
-		$source = "/opt/gforge/plugins/$plugin/etc/plugins/$plugin";
-		if (is_dir($source)) {
-			system("cp -r $source /etc/gforge/plugins/");
-		}
-	}
-
-	$apacheconffiles=array();
-	if (is_file('/etc/httpd/conf/httpd.conf')) {
-		$apacheconffiles[]='/etc/httpd/conf/httpd.conf';
-	} elseif (is_file('/opt/csw/apache2/etc/httpd.conf')) {
-		$apacheconffiles[]='/opt/csw/apache2/etc/httpd.conf';
-	} elseif (is_file('/etc/apache2/httpd.conf')) {
-		$apacheconffiles[]='/etc/apache2/httpd.conf';
-	} else {
-		$apacheconffiles[]='/etc/apache2/sites-enabled/000-default';
-	}
-
-	foreach ($apacheconffiles as $apacheconffile) {
-		echo('Setting FusionForge Include For Apache...');
-		system("grep \"^Include /etc/gforge/httpd.conf\" $apacheconffile > /dev/null", $ret);
-		if ($ret == 1) {
-			system("echo \"Include /etc/gforge/httpd.conf\" >> $apacheconffile");
-		}
-	}
-
-	// Create symlink for the wiki plugin.
-	if (!is_dir("/opt/gforge/www/wiki"))
-	{
-		symlink ("../plugins/wiki/www/", "/opt/gforge/www/wiki");
-	}
-
-	//#symlink plugin www's
-	//cd /opt/gforge/www
-	chdir("/opt/gforge/www");
-	if (!is_dir("plugins"))
-	{
-		system("mkdir -p plugins");
-	}
-
-	chdir("plugins");
-	if (!is_dir("cvstracker"))
-	{
-		symlink ("../../plugins/cvstracker/www/", "cvstracker");
-	}
-	if (!is_dir("svntracker"))
-	{
-		symlink ("../../plugins/svntracker/www/", "svntracker");
-	}
-	if (!is_dir("scmcvs"))
-	{
-		symlink ("../../plugins/scmcvs/www", "scmcvs");
-	}
-	if (!is_dir("fckeditor"))
-	{
-		symlink ("../../plugins/fckeditor/www", "fckeditor");
-	}
-
-	//cd /opt/gforge
-	chdir("/opt/gforge");
-	system("chown -R root:$args[3] /opt/gforge");
-	system("chmod -R 644 /opt/gforge/");
-	system("cd /opt/gforge && find -type d | xargs chmod 755");
-	system("chown -R $args[2]:$args[3] /var/lib/gforge/uploads");
-	system("chmod -R 755 /opt/gforge/cronjobs/");
-	system("chmod 755 /opt/gforge/www/scm/viewvc/bin/cgi/viewvc.cgi");
-	
-	if (!is_dir("/etc/gforge"))
-	{
-		echo "/etc/gforge didn't exist - error - make sure you've got permission";
-		exit(2);
-	}
-	system("chown -R root:$args[3] /etc/gforge/");
-	system("chmod -R 644 /etc/gforge/");
-	system("cd /etc/gforge && find -type d | xargs chmod 755");
-	system("cd /etc/gforge && find -type f -exec perl -pi -e \"s/apacheuser/$args[2]/\" {} \;");
-	system("cd /etc/gforge && find -type f -exec perl -pi -e \"s/apachegroup/$args[3]/\" {} \;");
-	system("cd /etc/gforge && find -type f -exec perl -pi -e \"s/gforge\.company\.com/$args[1]/\" {} \;");
-	system("echo \"noreply:	/dev/null\" >> /etc/aliases");
-
-	# Generate a random hash for the session_key
-	$hash = md5(microtime());
-	system("perl -spi -e \"s/sys_session_key = 'foobar'/sys_session_key = '$hash'/\" /etc/gforge/local.inc");
-
-	# Use liberation fonts if jpgraph provided in the archive.
-	if (is_dir("/opt/gforge/jpgraph")) {
-		system("perl -spi -e \"s!//(.gantt_title_font_family)='FF_ARIAL';!\\$1='FF_LIBERATION_SANS';!\" /etc/gforge/local.inc");
-		system("perl -spi -e \"s!//(.gantt_title_font_style=.*)!\\$1!\" /etc/gforge/local.inc");
-		system("perl -spi -e \"s!//(.gantt_title_font_size=.*)!\\$1!\" /etc/gforge/local.inc");
-		system("perl -spi -e \"s!//(.gantt_task_font_family)='FF_ARIAL';!\\$1='FF_LIBERATION_SANS';!\" /etc/gforge/local.inc");
-		system("perl -spi -e \"s!//(.gantt_task_font_style=.*)!\\$1!\" /etc/gforge/local.inc");
-		system("perl -spi -e \"s!//(.gantt_task_font_size=.*)!\\$1!\" /etc/gforge/local.inc");
-	}
-	print "\n";

Deleted: trunk/gforge/gforge-install-3-db.php
===================================================================
--- trunk/gforge/gforge-install-3-db.php	2010-02-07 15:28:17 UTC (rev 8728)
+++ trunk/gforge/gforge-install-3-db.php	2010-02-07 15:28:26 UTC (rev 8729)
@@ -1,420 +0,0 @@
-#!/usr/bin/php
-<?php
-/**
- * FusionForge Installation Dependency Setup
- *
- * Copyright 2006 GForge, LLC
- * http://gforge.org/
- *
- * @version
- *
- * This file is part of GInstaller, it is called by install.sh.
- *
- * GForge 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.
- *
- * GForge 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 GForge; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  US
- * Francisco Gimeno
- */
-
-define ('GREEN', "\033[01;32m" );
-define ('NORMAL', "\033[00m" );
-define ('RED', "\033[01;31m" );
-
-$STDOUT = fopen('php://stdout','w');
-$STDIN = fopen('php://stdin','r');
-
-show("\n-=# Welcome to FusionForge DB-Installer #=-");
-
-//TO DO: add dependency check
-//if (!run("php check-deps.php", true)) {
-//	echo RED.'Not all the necessary dependencies were found. aborting.'.NORMAL."\n";
-//	exit(1);
-//}
-
-// Make sure the DB is initialized by starting postgresql service
-if (is_file('/etc/init.d/postgresql')) 
-{
-	$pgservice='/etc/init.d/postgresql';
-} 
-elseif (is_file('/etc/init.d/postgresql-8.2'))
-{
-	$pgservice='/etc/init.d/postgresql-8.2';
-} 
-elseif (is_file('/etc/init.d/postgresql-8.3'))
-{
-	$pgservice='/etc/init.d/postgresql-8.3';
-}
-elseif (is_file('/etc/init.d/cswpostgres'))
-{
-	$pgservice='/etc/init.d/cswpostgres';
-}
-else
-{
-	die("ERROR: Could not find Postgresql init script\n");
-}
-
-# Fedora9 (an maybe newer) requires running initdb
-if ($pgservice == '/etc/init.d/postgresql') {
-	if (!is_dir("/var/lib/pgsql/data/base")) {
-		run("service postgresql initdb &>/dev/null", true);
-	}
-}
-
-// Might fail if it's already running, so we'll ingnore the result
-run("$pgservice start", true);
-
-// Where the PHP code will live
-//$gforge_lib_dir = '/opt/gforge5';   //CAMBIE ESTO
-$gforge_lib_dir = '/opt/gforge';
-
-if (!is_dir($gforge_lib_dir))
-{
-	die("Error: GForge folder doesn't exist. Run gforge-install-2.php first.");
-}
-
-
-// Where the configuration files will live
-$gforge_etc_dir = getenv('GFORGE_ETC_DIR');
-if (empty($gforge_etc_dir))
-{
-	$gforge_etc_dir = '/etc/gforge';
-}
-
-// Where the PGHBA config file is
-if (is_file("/var/lib/pgsql/data/pg_hba.conf"))
-{
-	// RedHat & SuSE
-	$PGHBA='/var/lib/pgsql/data/pg_hba.conf';
-}
-elseif (is_file('/etc/postgresql/8.2/main/pg_hba.conf'))
-{
-	$PGHBA='/etc/postgresql/8.2/main/pg_hba.conf';
-}
-elseif (is_file('/opt/csw/var/pgdata/pg_hba.conf'))
-{
-	$PGHBA='/opt/csw/var/pgdata/pg_hba.conf';
-}
-else
-{
-	die("ERROR: Could not find pg_hba.conf file\n");
-}
-
-
-if (is_file('/usr/share/pgsql/contrib/tsearch2.sql'))
-{
-	// RedHat
-	$tsearch2_sql='/usr/share/pgsql/contrib/tsearch2.sql';
-}
-elseif (is_file('/usr/share/postgresql/contrib/tsearch2.sql'))
-{
-	// SuSE
-	$tsearch2_sql='/usr/share/postgresql/contrib/tsearch2.sql';
-}
-elseif (is_file('/usr/share/postgresql/8.2/contrib/tsearch2.sql'))
-{
-	$tsearch2_sql='/usr/share/postgresql/8.2/contrib/tsearch2.sql';
-}
-elseif (is_file('/opt/csw/postgresql/share/contrib/tsearch2.sql'))
-{
-	// Solaris 10
-	$tsearch2_sql='/opt/csw/postgresql/share/contrib/tsearch2.sql';
-}
-else
-{
-	die("ERROR: Could not find tsearch2.sql file\n");
-}
-
-
-function install()
-{
-	global $PGHBA, $gforge_lib_dir, $gforge_etc_dir, $tsearch2_sql, $pgservice, $STDIN, $STDOUT;
-
-	show("\n * Enter the Database Name (gforge): ");
-
-	if (getenv('FFORGE_DB')) {
-		$gforge_db = getenv('FFORGE_DB');
-	} else {
-		$gforge_db = trim(fgets($STDIN));
-		if (strlen($gforge_db) == 0) {
-			$gforge_db = 'gforge';
-		}
-	}
-	show(" ...using '$gforge_db'");
-
-	show(' * Enter the Database Username (gforge): ');
-
-	if (getenv('FFORGE_USER')) {
-		$gforge_user = getenv('FFORGE_USER');
-	} else {
-		$gforge_user = trim(fgets($STDIN));
-		if (strlen($gforge_user) == 0) {
-			$gforge_user = 'gforge';
-		}
-	}
-	show(" ...using '$gforge_user'");
-
-	show(" * Modifying DB Access Permissions...");
-	if (!file_exists("$PGHBA.fforge.backup")) {
-		run("cp $PGHBA $PGHBA.fforge.backup", true);
-	}
-	run("echo \"# GFORGE\nlocal all all trust\" > $PGHBA");
-	show(' * Restarting PostgreSQL...');
-	run("$pgservice stop", true);
-	run("$pgservice start");
-
-
-	show(" * Creating '$gforge_user' Group...");
-	run("/usr/sbin/groupadd $gforge_user", true);
-
-	show(" * Creating '$gforge_user' User...");
-	run("/usr/sbin/useradd -g $gforge_user $gforge_user", true);
-
-	show(" * Creating Database User '$gforge_user'...");
-	run("su - postgres -c \"createuser -A -R -d -E $gforge_user\"", true);
-
-	show(' * Creating Language...');
-	run("su - postgres -c \"createlang plpgsql template1\"", true);
-
-	if (!is_dir("/home/$gforge_user")) {
-	    $susufix = '';
-	} else {
-	    $susufix = '-';
-	}
-
-	show(" * Creating '$gforge_db' Database...");
-	run("su $susufix $gforge_user -c \"createdb --encoding UNICODE $gforge_db\"", true);
-
-	# Detect postgresql version, load tsearch2 for pg < 8.3
-	$pg_version = explode(' ', shell_exec("postgres --version"));
-	$pgv = $pg_version[2];
-
-	if (preg_match('/^(7\.|8\.1|8\.2)/', $pgv)) {
-		show(" * Dumping tsearch2 Database Into '$gforge_db' DB");
-		run("su - postgres -c \"psql $gforge_db < $tsearch2_sql\" >> /tmp/gforge-import.log");
-
-		$tables = array('pg_ts_cfg', 'pg_ts_cfgmap', 'pg_ts_dict', 'pg_ts_parser');
-		foreach ($tables as $table) {
-			run('su - postgres -c "psql '.$gforge_db.' -c \\"GRANT ALL on '.$table.' TO '.$gforge_user.';\\""');
-		}
-//	} else {
-//		show(" * Creating FTS default configuation (Full Text Search)");
-//		run("su - postgres -c \"psql $gforge_db < $gforge_lib_dir/db/FTS-20081108.sql\" >> /tmp/gforge-import.log");
-	}
-
-
-	show(' * Dumping FusionForge DB');
-	run("su $susufix $gforge_user -c \"psql $gforge_db < $gforge_lib_dir/db/gforge.sql\" >> /tmp/gforge-import.log");
-
-//	show(' * Dumping FusionForge FTI DB');
-//	run("su $susufix $gforge_user -c \"psql $gforge_db < $gforge_lib_dir/db/FTI.sql\" >> /tmp/gforge-import.log");
-//	run("su $susufix $gforge_user -c \"psql $gforge_db < $gforge_lib_dir/db/FTI-20050315.sql\" >> /tmp/gforge-import.log");
-//	run("su $susufix $gforge_user -c \"psql $gforge_db < $gforge_lib_dir/db/FTI-20050401.sql\" >> /tmp/gforge-import.log");
-//	run("su $susufix $gforge_user -c \"psql $gforge_db < $gforge_lib_dir/db/FTI-20050530.sql\" >> /tmp/gforge-import.log");
-//	run("su $susufix $gforge_user -c \"psql $gforge_db < $gforge_lib_dir/db/FTI-20060130.sql\" >> /tmp/gforge-import.log");
-//	run("su $susufix $gforge_user -c \"psql $gforge_db < $gforge_lib_dir/db/FTI-20061025.sql\" >> /tmp/gforge-import.log");
-
-	show(" * Enter the Admin Username (fforgeadmin): ");
-	if (getenv('FFORGE_ADMIN_USER')) {
-		$admin_user = getenv('FFORGE_ADMIN_USER');
-	} else {
-		$admin_user = trim(fgets($STDIN));
-
-		if (strlen($admin_user) == 0) {
-			$admin_user = 'fforgeadmin';
-		}
-	}
-	show(" ...using '$admin_user'");
-
-	if (getenv('FFORGE_ADMIN_PASSWORD')) {
-		$bad_pwd = false;
-		$pwd1 = getenv('FFORGE_ADMIN_PASSWORD');
-	} else {
-		$retries = 0;
-		$bad_pwd = true;
-		$pwd1 = '';
-		$pwd2 = '';
-		$error = '';
-		while ($bad_pwd && $retries < 5) {
-			if ($bad_pwd && $retries > 0) {
-				show(' * ' . $error);
-			}
-			$pwd1 = readMasked(" * Enter the Site Admin Password:");
-			$error = validatePassword($pwd1);
-			if ($error != '') {
-				$bad_pwd = true;
-			} else {
-				$pwd2 = readMasked(" * Please enter it again: \n");
-				if ($pwd1 == $pwd2) {
-					$bad_pwd = false;
-				} else {
-					$error = 'Passwords don\'t match. Please try again.';
-				}
-			}
-			$retries++;
-		}
-	}
-
-	if ($bad_pwd) {
-		show('Passwords didn\'t match! Aborting.');
-		die();
-	} else {
-		$pw_md5 = md5($pwd1);
-		$pw_crypt = crypt($pwd1);
-		$pw_crypt = str_replace('$', '\\\\\\$', $pw_crypt);
-		//run(	'su - postgres -c "psql ' . 
-		//	$gforge_db . 
-		//	' -c \\"UPDATE \\\\\"user\\\\\" SET unix_name=\'' . 
-		//	$admin_user . '\', password_md5=\'' . 
-		//	$pw_md5 . '\', password_crypt=\'' . 
-		//	$pw_crypt . '\' WHERE user_id=101;\\""'); // MODIFIQUE ESTO
-
-		//run(	'su - postgres -c "psql ' . 
-		//	$gforge_db . 
-		//	' -c \\"UPDATE \\\\\"users\\\\\" SET user_name=\'' . 
-		//	$admin_user . '\', user_pw=\'' . 
-		//	$pw_md5 . '\', unix_pw=\'' . 
-		//	$pw_crypt . '\' WHERE user_id=101;\\""');
-//echo "BREAKPOINT 1\n";
-//$t = trim(fgets($STDIN));
-
-//	run("su - postgres -c \"psql $gforge_db -c \\\"INSERT INTO users (user_name, user_pw, unix_pw) VALUES ('$admin_user', '$pw_md5', '$pw_crypt')\\\"\"");
-	run("su - postgres -c \"psql $gforge_db -c \\\"INSERT INTO users (user_name, email, user_pw, unix_pw, status, theme_id) VALUES ('$admin_user', 'root at localhost.localdomain', '$pw_md5', '$pw_crypt', 'A', 1); INSERT INTO user_group (user_id, group_id, admin_flags) VALUES (currval('users_pk_seq'), 1, 'A')\\\"\"");
-
-//echo "BREAKPOINT 2\n";
-//$t = trim(fgets($STDIN));
-
-//	run("su - postgres -c \"psql $gforge_db -c \\\"INSERT INTO user_group (user_id, group_id, admin_flags) VALUES (currval('users_pk_seq'), 1, 'A')\\\"\"" );
-
-//echo "BREAKPOINT 3\n";
-//$t = trim(fgets($STDIN));
-
-	}
-	if (!is_dir($gforge_etc_dir)) {
-		mkdir($gforge_etc_dir);
-	}
-
-
-	show(' * Saving database configuration in FForge config file');
-	$data = file_get_contents("$gforge_etc_dir/local.inc");
-	$lines = explode("\n",$data);
-	$config = '';
-	foreach ($lines as $l) {
-		$l = preg_replace("/^.sys_dbname\s*=\s*'(.*)'/", "\$sys_dbname='$gforge_db'", $l);
-		$l = preg_replace("/^.sys_dbuser\s*=\s*'(.*)'/", "\$sys_dbuser='$gforge_user'", $l);
-		$config .= $l."\n";
-	}
-
-	if ($fp = fopen("$gforge_etc_dir/local.inc", "w")) {
-		fwrite ($fp, $config);
-		fclose($fp);	
-	}
-
-	show(' * Saving installation log in /tmp/gforge-import.log');
-}
-/*
-function uninstall() {
-	global $PGHBA, $gforge_lib_dir, $gforge_var_dir, $gforge_etc_dir, $gforge_db, $gforge_user, $tsearch2_sql;
-
-	show(" * Removing DATABASE \n";
-	system("su - $gforge_user -c \"dropdb $gforge_db\"", $ret );
-	show(" done . ($ret)\n";
-
-	show(" * Removing Language \n";
-	system("su - postgres -c \"droplang plpgsql template1\"", $ret );
-	show(" done. ($ret)\n";
-
-	show(" * Removing GForge DATABASE User: \n";
-	system("su - postgres -c \"dropuser $gforge_user\"", $ret );
-	show(" done.($ret)");
-
-	show(" * Removing GForge User: \n";
-	system("userdel $gforge_user");
-	show(" done.");
-
-	show(" * Restoring $PGHBA file: ... ";
-	system("cp $PGHBA.gforge.backup $PGHBA");
-	show(" done.");
-
-	show(" * Restarting PostgreSQL: ...\n";
-	system("/etc/init.d/postgresql restart");
-	show(" done.");
-}
-*/
-
-function validatePassword($password) {
-	if (strlen($password)<6) {
-		return 'Password is too short. Please try again.';
-	}
-	if (!preg_match('/[[:alnum:]]*/', $password)) {
-		return 'Password contains invalid characters. Please try again.';
-	}
-	return '';
-}
-
-function readMasked($prompt) {
-	global $STDIN;
-	if (strtolower(php_uname('s')) == 'sunos') {
-	    show($prompt);
-	    $text_entered = fgets($STDIN);
-	} else {
-	    $options="-er -s -p";
-	    $returned=popen("read $options \"".GREEN.$prompt.NORMAL."\n\"; echo \$REPLY", 'r');
-	    $text_entered=fgets($returned, 100);
-	    pclose($returned);
-	    $text_entered=substr($text_entered, 0, strlen($text_entered));
-	    @ob_flush();
-	    flush();
-	}
-	return trim($text_entered);
-}
-
-function finish() {
-	show(NORMAL."Done.\nYou are ready to run install-gforge-3.php");
-}
-
-function show($text, $newLine = true) {
-	global $STDOUT;
-
-	$hd = fopen ("/tmp/gforge-import.log", "a+");
-	fwrite($hd, "*** $text\n");
-	fclose($hd);
-
-	if ($newLine) {
-		$text = GREEN.$text .NORMAL."\n";
-	}
-	fwrite($STDOUT, $text);
-}
-
-function run($command, $ignore = false) {
-
-	$hd = fopen ("/tmp/gforge-import.log", "a+");
-	fwrite($hd, "CMD ".$command."\n");
-	fclose($hd);
-
-	system($command, $ret);
-	if ($ignore) {
-		if ($ret != 0) {
-			return false;
-		} else {
-			return true;
-		}
-	} else {
-		if ($ret != 0) {
-			echo RED.'An error ocurred running the last command... aborting.'.NORMAL."\n";
-			die();
-		}
-	}
-}
-
-install();
-?>

Modified: trunk/gforge/install.sh
===================================================================
--- trunk/gforge/install.sh	2010-02-07 15:28:17 UTC (rev 8728)
+++ trunk/gforge/install.sh	2010-02-07 15:28:26 UTC (rev 8729)
@@ -26,7 +26,6 @@
 hostname=$1
 type=""
 msg=""
-version=4.8.2
 distrib=""
 
 if [ -f "/etc/redhat-release" ]
@@ -74,13 +73,13 @@
 if [ "$type" = "redhat" ]
 then
 	yum -y install php
-	php gforge-install-1-deps.php $deps
-	php gforge-install-2.php "$hostname" apache apache
+	php fusionforge-install-1-deps.php $deps
+	php fusionforge-install-2.php "$hostname" apache apache
 
 	if [ $mode = "install" ]
 	then
-		php gforge-install-3-db.php
-		php db/startpoint.php $version
+		php fusionforge-install-3-db.php
+		php db/upgrade-db.php
 
 		# Post installation fixes.
 		perl -spi -e "s/^#ServerName (.*):80/ServerName $hostname:80/" /etc/httpd/conf/httpd.conf
@@ -103,13 +102,13 @@
 elif [ "$type" = "suse" ]
 then
 	yast -i php5
-	php gforge-install-1-deps.php $deps
-	php gforge-install-2.php "$hostname" wwwrun www
+	php fusionforge-install-1-deps.php $deps
+	php fusionforge-install-2.php "$hostname" wwwrun www
 
 	if [ $mode = "install" ]
 	then
-		php gforge-install-3-db.php
-		php db/startpoint.php $version
+		php fusionforge-install-3-db.php
+		php db/upgrade-db.php
 
 		# Post installation fixes.
 		#perl -spi -e "s/^#ServerName (.*):80/ServerName $hostname:80/" /etc/apache2/httpd.conf




More information about the Fusionforge-commits mailing list