Skip to content

Commit 8085520

Browse files
francescobiancofrancescobianco
committed
update files
1 parent d9fc324 commit 8085520

File tree

145 files changed

+4860
-371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+4860
-371
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
node_modules/
44
mysql/
55
npm-debug.log
6+
develop-install.sh
7+
!/develop-install.sh

‎5.1.0/Dockerfile‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ RUN apt-get update \
3636
COPY php.ini /usr/local/etc/php/php.ini
3737
COPY crontab /etc/cron.d/crontab
3838
COPY 000-default.conf /etc/apache2/sites-available/000-default.conf
39-
COPY localhost.crt /etc/apache2/ssl/localhost.crt
40-
COPY localhost.pem /etc/apache2/ssl/localhost.pem
41-
COPY setup-wizard.php /var/www/html/
39+
COPY vtiger.crt /etc/apache2/ssl/vtiger.crt
40+
COPY vtiger.pem /etc/apache2/ssl/vtiger.pem
41+
COPY wizard.php /var/www/html/
4242
COPY foreground.sh /usr/local/bin/foreground
4343
COPY extends.sh /usr/local/bin/extends
4444
COPY install.sh /usr/local/bin/install
@@ -51,7 +51,11 @@ RUN a2enmod rewrite \
5151

5252
RUN MYSQL_HOST=localhost \
5353
MYSQL_ROOT_PASSWORD=root \
54-
install --install-mysql --dump --remove-mysql
54+
install --install-mysql --wizard --dump --remove-mysql
55+
56+
RUN MYSQL_HOST=localhost \
57+
MYSQL_ROOT_PASSWORD=root \
58+
install --install-mysql --wizard --dump --remove-mysql
5559

5660
#COPY config.inc.php /var/www/html/vtiger/
5761

‎5.1.0/foreground.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
set -e
3+
4+
## import database using environment variables
5+
./vendor/bin/mysql-import vtiger.sql
6+
7+
## run cron
8+
cron
9+
10+
## run apache
11+
apache2-foreground

‎5.1.0/install.sh‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,20 @@ if [[ $@ == *'--install-mysql'* ]]; then
3838
service mysql restart && sleep 10s
3939
## Check if database exists
4040
ASSERT_DB=`mysqlshow -uroot -proot -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger`
41-
if [ "$ASSERT_DB" != "vtiger" ]; then exit 65; fi
41+
if [ "$ASSERT_DB" != "vtiger" ]; then echo "INSTALL(ERROR) '--install-mysql' database not found."; exit 65; fi
4242
fi
4343

44-
## Restart service
45-
service apache2 restart && sleep 10s
46-
47-
## Check if apache is ready
48-
VT_READY=`curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n"`
49-
if [ "$VT_READY" != "HTTP/1.1 200 OK" ]; then exit 64; fi
50-
51-
## Run interactive installation
52-
php /var/www/html/setup-wizard.php
53-
if [ $? -ne 0 ]; then exit 66; fi
44+
## Execute Wizard
45+
if [[ $@ == *'--wizard'* ]]; then
46+
## Restart service
47+
service apache2 restart && sleep 10s
48+
## Check if apache is ready
49+
VT_READY=`curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n"`
50+
if [ "$VT_READY" != "HTTP/1.1 200 OK" ]; then exit 64; fi
51+
## Run interactive installation
52+
php /var/www/html/wizard.php
53+
if [ $? -ne 0 ]; then exit 66; fi
54+
fi
5455

5556
## Export fresh database
5657
if [[ $@ == *'--dump'* ]]; then

‎5.1.0/vtiger.crt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIID/zCCAuegAwIBAgIJAOTDf4xw8akaMA0GCSqGSIb3DQEBCwUAMIGVMQswCQYD
3+
VQQGEwJVSzEPMA0GA1UECAwGTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xHDAaBgNV
4+
BAoME0NvVmkgQW5hbHl0aWNzIGx0ZC4xDjAMBgNVBAsMBUNNSUxFMQ4wDAYDVQQD
5+
DAVDTUlMRTEmMCQGCSqGSIb3DQEJARYXaGVsbG9AY292aWFuYWx5dGljcy5jb20w
6+
HhcNMTcwNzAzMjEwNjI2WhcNMjcwNzAzMjEwNjI2WjCBlTELMAkGA1UEBhMCVUsx
7+
DzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwGTG9uZG9uMRwwGgYDVQQKDBNDb1Zp
8+
IEFuYWx5dGljcyBsdGQuMQ4wDAYDVQQLDAVDTUlMRTEOMAwGA1UEAwwFQ01JTEUx
9+
JjAkBgkqhkiG9w0BCQEWF2hlbGxvQGNvdmlhbmFseXRpY3MuY29tMIIBIjANBgkq
10+
hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl3wWNH5J3wYeMO8wwNAOx7jh/MlR3tG2
11+
1aFEU3d698gVpxmhBVNW0vYlk7QbrRkyvbupgm8enFEMi4qhd63gu0Nb+idky/wN
12+
BHBwJ5TZTuj4cj1Kz8q+M3CaYWyYTpZMUShsC6RFLtH0qxLYqALk3dW9BHOPlP9x
13+
h5Tq7wBVJizlINWjKJFITHHMG4443d5n6+Ve9cT3Nvz0GfYaR4IixvJJrL46A9hz
14+
R0W1XS73ItGHO6D90m7qVN8feKYUj+T6WH4gBq3zs/o2dmE/B2PQyja6YePJrojg
15+
U/vRuMA43tO+sehgiwGnGDIjj58TqKzBDOsSewVvmsLSKQQ3ojFdbQIDAQABo1Aw
16+
TjAdBgNVHQ4EFgQU2tuyeV+QS9EKDEgVqWUIG92UwHEwHwYDVR0jBBgwFoAU2tuy
17+
eV+QS9EKDEgVqWUIG92UwHEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
18+
AQEAdoO2l2O0KAAA8IJ95OeM98RPuu9r3eFSBESW+wV/Lr7qy05wOv1I7W9BTYLS
19+
EKA3rQzlpS1pip3IdFosKNOY/8e2SNe/zuuzkeRc8WOhs/b04kNepKY0O2yPAXic
20+
gMj8I5l9jnhLkhGmHWQJ+vjvNw7Tyeq23lfhdUSnjNZG6W5kGNwv7mYn+VPlt1iT
21+
8JvliDsrw1M9kepZvhqf2oap0glPx2f047hJwiFYwNEsePZHszI3tit78JiYNLFY
22+
JnRZvMtQ3nAp8cM7KvPnUxphMPV1Zn1IF03J60rW7o1da3EWUQ6p9A/TPosHEaP+
23+
IoCOWpQqMLKkchNkRmTXv0CHRw==
24+
-----END CERTIFICATE-----

‎5.1.0/vtiger.pem‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXfBY0fknfBh4w
3+
7zDA0A7HuOH8yVHe0bbVoURTd3r3yBWnGaEFU1bS9iWTtButGTK9u6mCbx6cUQyL
4+
iqF3reC7Q1v6J2TL/A0EcHAnlNlO6PhyPUrPyr4zcJphbJhOlkxRKGwLpEUu0fSr
5+
EtioAuTd1b0Ec4+U/3GHlOrvAFUmLOUg1aMokUhMccwbjjjd3mfr5V71xPc2/PQZ
6+
9hpHgiLG8kmsvjoD2HNHRbVdLvci0Yc7oP3SbupU3x94phSP5PpYfiAGrfOz+jZ2
7+
YT8HY9DKNrph48muiOBT+9G4wDje076x6GCLAacYMiOPnxOorMEM6xJ7BW+awtIp
8+
BDeiMV1tAgMBAAECggEAOvZkmjgRvspd1AQ2AMa7CggvhjpCMK2GMe7cbnSSG4H4
9+
05rJLw56PBDtHWm8YArv0iQKXaeszYFKlcH3CWNXluwoD91ngXJxCqpNLUrlrq5F
10+
jgnHZcvvboxEuukO+3/K4sgODhX5i7jTOAdU50iBFsuMEAB/AarP4MsZCsAhZIL5
11+
tbMN7kMkI1Y4uwg0suz0jl1ajWBWKThgPSK1mxpjs3Xel1+ZEdvG8rjhCyi/bhQr
12+
aouOh1mHFklhqJ3Okl6aZC1AhocUxFCz6tIAHbdqk1D451ZP9+3noAMhDeNajSCC
13+
AQlctyahscmb+AJ5mkAOgqW8A1vohYhD9LEYBxz/AQKBgQDIN0+gAek2MGut05Y7
14+
lcolq0w0ih2Q82zjV3dtcagxOIDZrgwh/ZU+Wo8JecUYlHwvNOfN4+nzmo0tyyO1
15+
l1+YvpIiRwaGiFXhalVkAJqr4UjVkN0dTu5ST6LtVe/HuF3M2smS1n6JpGlBiMde
16+
xSFP7hF3QTfXQ+7lnjXQURK0LQKBgQDBsPHZbfWSfbUhNYDy7GWNjovZZSwGib8y
17+
y62QfIitOZsYVLMSqSxTzKa8tS5pgGr8X5HJU/MKa29b8g7rL/yG9Mxm4nOejVMP
18+
nXGoeDk/8Eo61tWlYEwmh6qfOuDQ2HkQgP2RYCOG3OAOx5VTEuqfY0+ZY2lrkMvH
19+
uMTnEaTWQQKBgDpbVMwQgocW6evKhjlr2XXNTfLqZt++8/f3oIm33QwrqfLItiSa
20+
Iwv/nT1nzrjxXpjr1LzAN4qXe5rjYM8nBeghc7ql9RL1XgLL2YPCYVLD4VTOWoSW
21+
YwR+zcBbkf4mkMCK7MHt3wgDceJ2GZZX4vPHMjQOQFZwKIuo54qGduspAoGABxBC
22+
4aEG8Z6v+lQPLcy9L1phcz4jSuG/HUUcQUapXVfadhqwpR+SREQUWJFq7eIHBMkf
23+
ce4j0N92Ii5DqQQI+4r14VKk0MVqoAkn2fL4c4J50od/JxbJ8CXGbSQiirs6PwXV
24+
OXX+Fa78ZM2Wfn8UG1ft0TQ05f1T0SbF139nOYECgYEAv9gWIw3Zcsxiv+lgE6MH
25+
I2xvmB9zfkhiRIGwdK9KiV79qvFUQv+RJVd+VzkSUXf46yT6lp97ohdWbpb90Izr
26+
XoVXhPfMfVZ46JYkQt+jCMqak6p3nU3JJOsvWYCfJyW+jyuU/ESWSWcTMwavt8y+
27+
W/Vgi8aWk1+q87ANi4TOXUs=
28+
-----END PRIVATE KEY-----

‎5.1.0/wizard.php‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<?php
2+
3+
echo "[vtiger] setup wizard start...\n";
4+
5+
define('DB_HOST', getenv('MYSQL_HOST') ?: 'mysql');
6+
define('DB_PORT', getenv('MYSQL_PORT') ?: '3306');
7+
define('DB_NAME', getenv('MYSQL_DATABASE') ?: 'vtiger');
8+
define('DB_USER', getenv('MYSQL_USER') ?: 'root');
9+
define('DB_PASS', getenv('MYSQL_PASSWORD') ?: 'root');
10+
define('DB_ROOT', getenv('MYSQL_ROOT_PASSWORD') ?: 'root');
11+
12+
date_default_timezone_set('America/Los_Angeles');
13+
14+
echo '[vtiger] arguments: '.DB_HOST.' '.DB_PORT.' '.DB_NAME.' '.DB_USER.' '.DB_PASS.' '.DB_ROOT."\n";
15+
16+
require_once __DIR__.'/vendor/autoload.php';
17+
18+
use Javanile\HttpRobot\HttpRobot;
19+
20+
$robot = new HttpRobot([
21+
'base_uri' => 'http://localhost/',
22+
'cookies' => true,
23+
]);
24+
25+
// Get session token
26+
$vtrftk = $robot->get('index.php?module=Install&view=Index&mode=Step4', '__vtrftk');
27+
echo "[vtiger] form token: {$vtrftk}\n";
28+
29+
// Submit installation params
30+
$values = $robot->post(
31+
'index.php',
32+
[
33+
'__vtrftk' => $vtrftk,
34+
'module' => 'Install',
35+
'view' => 'Index',
36+
'mode' => 'Step5',
37+
'db_type' => 'mysqli',
38+
'db_hostname' => DB_HOST,
39+
'db_username' => DB_USER,
40+
'db_password' => DB_PASS,
41+
'db_name' => DB_NAME,
42+
'db_root_username' => '',
43+
'db_root_password' => '',
44+
'currency_name' => 'USA, Dollars',
45+
'admin' => 'admin',
46+
'password' => 'admin',
47+
'retype_password' => 'admin',
48+
'firstname' => '',
49+
'lastname' => 'Administrator',
50+
'admin_email' => 'vtiger@localhost.lan',
51+
'dateformat' => 'dd-mm-yyyy',
52+
'timezone' => 'America/Los_Angeles',
53+
],
54+
['__vtrftk', 'auth_key']
55+
);
56+
echo "[vtiger] form token: '{$values['__vtrftk']}', auth token: '{$values['auth_key']}'\n";
57+
58+
// Confirm installation
59+
$values = $robot->post(
60+
'index.php',
61+
[
62+
'__vtrftk' => $values['__vtrftk'],
63+
'auth_key' => $values['auth_key'],
64+
'module' => 'Install',
65+
'view' => 'Index',
66+
'mode' => 'Step6',
67+
],
68+
['__vtrftk', 'auth_key']
69+
);
70+
echo "[vtiger] form token: '{$values['__vtrftk']}', auth token: '{$values['auth_key']}'\n";
71+
72+
// Select industry sector
73+
$vtrftk = $robot->post(
74+
'index.php',
75+
[
76+
'__vtrftk' => $values['__vtrftk'],
77+
'auth_key' => $values['auth_key'],
78+
'module' => 'Install',
79+
'view' => 'Index',
80+
'mode' => 'Step7',
81+
'industry' => 'Accounting',
82+
],
83+
['__vtrftk']
84+
);
85+
86+
// First login
87+
$vtrftk = $robot->post(
88+
'index.php?module=Users&action=Login',
89+
[
90+
'__vtrftk' => $vtrftk,
91+
'username' => 'admin',
92+
'password' => 'admin',
93+
],
94+
['__vtrftk']
95+
);
96+
97+
// Setup crm modules
98+
$vtrftk = $robot->post(
99+
'index.php?module=Users&action=SystemSetupSave',
100+
[
101+
'__vtrftk' => $vtrftk,
102+
'packages[Tools]' => 'on',
103+
'packages[Sales]' => '',
104+
'packages[Marketing]' => '',
105+
'packages[Support]' => '',
106+
'packages[Inventory]' => '',
107+
'packages[Project]' => '',
108+
],
109+
['__vtrftk']
110+
);
111+
112+
// Save user settings
113+
$vtrftk = $robot->post(
114+
'index.php?module=Users&action=UserSetupSave',
115+
[
116+
'__vtrftk' => $vtrftk,
117+
'currency_name' => 'Euro',
118+
'lang_name' => 'it_it',
119+
'time_zone' => 'Europe/Amsterdam',
120+
'date_format' => 'dd-mm-yyyy',
121+
],
122+
['__vtrftk']
123+
);

‎5.2.0-RC/Dockerfile‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LABEL maintainer='Francesco Bianco <info@javanile.org>'
44
WORKDIR /var/www/html
55

66
ENV VT_VERSION=5.2.0-RC
7-
ENV VT_DOWNLOAD=http://sourceforge.net/projects/vtigercrm/files/vtiger%20CRM%206.0%20RC/Core%20Product/vtigercrm-6.0.0rc.tar.gz
7+
ENV VT_DOWNLOAD=http://sourceforge.net/projects/vtigercrm/files/vtiger%20CRM%205.2.0%20RC/vtigercrm-5.2.0-RC.tar.gz
88
ENV MYSQL_HOST=mysql
99
ENV MYSQL_DATABASE=vtiger
1010

@@ -36,9 +36,9 @@ RUN apt-get update \
3636
COPY php.ini /usr/local/etc/php/php.ini
3737
COPY crontab /etc/cron.d/crontab
3838
COPY 000-default.conf /etc/apache2/sites-available/000-default.conf
39-
COPY localhost.crt /etc/apache2/ssl/localhost.crt
40-
COPY localhost.pem /etc/apache2/ssl/localhost.pem
41-
COPY setup-wizard.php /var/www/html/
39+
COPY vtiger.crt /etc/apache2/ssl/vtiger.crt
40+
COPY vtiger.pem /etc/apache2/ssl/vtiger.pem
41+
COPY wizard.php /var/www/html/
4242
COPY foreground.sh /usr/local/bin/foreground
4343
COPY extends.sh /usr/local/bin/extends
4444
COPY install.sh /usr/local/bin/install
@@ -51,7 +51,11 @@ RUN a2enmod rewrite \
5151

5252
RUN MYSQL_HOST=localhost \
5353
MYSQL_ROOT_PASSWORD=root \
54-
install --install-mysql --dump --remove-mysql
54+
install --install-mysql --wizard --dump --remove-mysql
55+
56+
RUN MYSQL_HOST=localhost \
57+
MYSQL_ROOT_PASSWORD=root \
58+
install --install-mysql --wizard --dump --remove-mysql
5559

5660
#COPY config.inc.php /var/www/html/vtiger/
5761

‎5.2.0-RC/foreground.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
set -e
3+
4+
## import database using environment variables
5+
./vendor/bin/mysql-import vtiger.sql
6+
7+
## run cron
8+
cron
9+
10+
## run apache
11+
apache2-foreground

‎5.2.0-RC/install.sh‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,20 @@ if [[ $@ == *'--install-mysql'* ]]; then
3838
service mysql restart && sleep 10s
3939
## Check if database exists
4040
ASSERT_DB=`mysqlshow -uroot -proot -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger`
41-
if [ "$ASSERT_DB" != "vtiger" ]; then exit 65; fi
41+
if [ "$ASSERT_DB" != "vtiger" ]; then echo "INSTALL(ERROR) '--install-mysql' database not found."; exit 65; fi
4242
fi
4343

44-
## Restart service
45-
service apache2 restart && sleep 10s
46-
47-
## Check if apache is ready
48-
VT_READY=`curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n"`
49-
if [ "$VT_READY" != "HTTP/1.1 200 OK" ]; then exit 64; fi
50-
51-
## Run interactive installation
52-
php /var/www/html/setup-wizard.php
53-
if [ $? -ne 0 ]; then exit 66; fi
44+
## Execute Wizard
45+
if [[ $@ == *'--wizard'* ]]; then
46+
## Restart service
47+
service apache2 restart && sleep 10s
48+
## Check if apache is ready
49+
VT_READY=`curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n"`
50+
if [ "$VT_READY" != "HTTP/1.1 200 OK" ]; then exit 64; fi
51+
## Run interactive installation
52+
php /var/www/html/wizard.php
53+
if [ $? -ne 0 ]; then exit 66; fi
54+
fi
5455

5556
## Export fresh database
5657
if [[ $@ == *'--dump'* ]]; then

0 commit comments

Comments
 (0)