Skip to content

Commit 3ce59dd

Browse files
raupulusraupulus
authored
Merge pull request #189 from fryntiz/dev
Actualización del script y programas, preparando compatibilidad Debian 10, correcciones y refactorización
2 parents d5a4bec + 2b60bd6 commit 3ce59dd

File tree

449 files changed

+3190
-1057
lines changed

Some content is hidden

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

449 files changed

+3190
-1057
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ errores.log
3737
/conf/home/.vim/spec
3838
/conf/home/.vim/syntax_checkers
3939
/conf/home/.vim/test
40+
/conf/home/.vim/ftdetect
4041
/.idea
4142
npm-debug.log
4243
/npm-debug.log

‎Apache2/etc/apache2/sites-available/default-ssl.conf

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<VirtualHost *:443>
2+
ServerName localhost.local
3+
ServerAdmin [email protected]
4+
DocumentRoot /var/www/default
5+
ErrorLog ${APACHE_LOG_DIR}/default.local/ssl-error.log
6+
CustomLog ${APACHE_LOG_DIR}/default.local/ssl-access.log combined
7+
<Directory /var/www/default/>
8+
AllowOverride All
9+
</Directory>
10+
11+
SSLEngine on
12+
SSLCertificateKeyFile /etc/apache2/ssl/localhost.key
13+
SSLCertificateFile /etc/apache2/ssl/localhost.crt
14+
#SSLCACertificateFile /etc/ssl/certs/bundle.crt
15+
16+
BrowserMatch "MSIE [2-6]" \
17+
nokeepalive ssl-unclean-shutdown \
18+
downgrade-1.0 force-response-1.0
19+
# MSIE 7 and newer should be able to use keepalive
20+
BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
21+
22+
#<FilesMatch "\.(php|py)$">
23+
# SSLOptions +StdEnvVars
24+
#</FilesMatch>
25+
</VirtualHost>
26+
27+
28+
#Algunas directivas útiles:
29+
#ServerAlias dev.local
30+
#ServerAlias www.dev.local

‎Apache2/etc/apache2/sites-available/default.conf

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
ServerName localhost
33
ServerAdmin [email protected]
44

5-
ErrorLog ${APACHE_LOG_DIR}/error.log
6-
CustomLog ${APACHE_LOG_DIR}/access.log combined
5+
ErrorLog ${APACHE_LOG_DIR}/default.local/error.log
6+
CustomLog ${APACHE_LOG_DIR}/default.local/access.log combined
77

8-
DocumentRoot /var/www/html/Publico/default
8+
DocumentRoot /var/www/default
99
</VirtualHost>
1010

1111

‎Apache2/etc/apache2/sites-available/dev.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
ErrorLog ${APACHE_LOG_DIR}/dev.local/error.log
66
CustomLog ${APACHE_LOG_DIR}/dev.local/access.log combined
77

8-
DocumentRoot /var/www/html/dev
9-
<Directory /var/www/html/dev/>
8+
DocumentRoot /var/www/dev
9+
<Directory /var/www/dev/>
1010
AllowOverride All
1111
</Directory>
1212
</VirtualHost>

‎Apache2/etc/apache2/sites-available/plantilla-ssl.conf

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<VirtualHost *:443>
22
ServerName plantilla.local
33
ServerAdmin [email protected]
4-
DocumentRoot /var/www/html/Privado
5-
ErrorLog ${APACHE_LOG_DIR}/privado.local/ssl-error.log
6-
CustomLog ${APACHE_LOG_DIR}/privado.local/ssl-access.log combined
7-
<Directory /var/www/html/Privado/>
4+
DocumentRoot /var/www/plantilla
5+
ErrorLog ${APACHE_LOG_DIR}/plantilla.local/ssl-error.log
6+
CustomLog ${APACHE_LOG_DIR}/plantilla.local/ssl-access.log combined
7+
<Directory /var/www/plantilla/>
88
AllowOverride All
99
</Directory>
1010

‎Apache2/etc/apache2/sites-available/privado.conf

-16
This file was deleted.

‎Apache2/etc/apache2/sites-available/privado-ssl.conf renamed to ‎Apache2/etc/apache2/sites-available/private-ssl.conf

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<VirtualHost *:443>
2-
ServerName privado.local
2+
ServerName private.local
33
ServerAdmin [email protected]
4-
DocumentRoot /var/www/html/Privado
5-
ErrorLog ${APACHE_LOG_DIR}/privado.local/ssl-error.log
6-
CustomLog ${APACHE_LOG_DIR}/privado.local/ssl-access.log combined
7-
<Directory /var/www/html/Privado/>
4+
DocumentRoot /var/www/private
5+
ErrorLog ${APACHE_LOG_DIR}/private.local/ssl-error.log
6+
CustomLog ${APACHE_LOG_DIR}/private.local/ssl-access.log combined
7+
<Directory /var/www/private/>
88
AllowOverride All
99
</Directory>
1010

‎Apache2/etc/apache2/sites-available/private.conf

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<VirtualHost *:80>
2+
ServerName private.local
3+
ServerAdmin [email protected]
4+
5+
ErrorLog ${APACHE_LOG_DIR}/private.local/error.log
6+
CustomLog ${APACHE_LOG_DIR}/private.local/access.log combined
7+
8+
DocumentRoot /var/www/private
9+
<Directory /var/www/private/>
10+
AllowOverride All
11+
</Directory>
12+
</VirtualHost>
13+
14+
#Algunas directivas útiles:
15+
#ServerAlias privado.local
16+
#ServerAlias www.privado.local

‎Apache2/etc/apache2/sites-available/publico-ssl.conf renamed to ‎Apache2/etc/apache2/sites-available/public-ssl.conf

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<VirtualHost *:443>
2-
ServerName publico.local
2+
ServerName public.local
33
ServerAdmin [email protected]
4-
DocumentRoot /var/www/html/Publico
5-
ErrorLog ${APACHE_LOG_DIR}/publico.local/ssl-error.log
6-
CustomLog ${APACHE_LOG_DIR}/publico.local/ssl-access.log combined
7-
<Directory /var/www/html/Publico/>
4+
DocumentRoot /var/www/public
5+
ErrorLog ${APACHE_LOG_DIR}/public.local/ssl-error.log
6+
CustomLog ${APACHE_LOG_DIR}/public.local/ssl-access.log combined
7+
<Directory /var/www/public/>
88
AllowOverride All
99
</Directory>
1010

‎Apache2/etc/apache2/sites-available/public.conf

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<VirtualHost *:80>
2+
ServerName public.local
3+
ServerAdmin [email protected]
4+
5+
ErrorLog ${APACHE_LOG_DIR}/public.local/error.log
6+
CustomLog ${APACHE_LOG_DIR}/public.local/access.log combined
7+
8+
DocumentRoot /var/www/public
9+
</VirtualHost>
10+
11+
12+
#Algunas directivas útiles:
13+
#ServerAlias localhost.local
14+
#ServerAlias www.localhost.local

‎Apache2/etc/apache2/sites-available/publico.conf

-14
This file was deleted.

‎Apache2/www/html/favicon.ico renamed to ‎Apache2/www/default/favicon.ico

File renamed without changes.

‎Apache2/www/html/favicon.png renamed to ‎Apache2/www/default/favicon.png

File renamed without changes.

‎Apache2/www/html/index.php renamed to ‎Apache2/www/default/index.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?php
33
/**
44
* @author Raúl Caro Pastorino
5-
* @copyright Copyright © 2017 Raúl Caro Pastorino
5+
* @copyright Copyright © 2019 Raúl Caro Pastorino
66
* @license https://www.gnu.org/licenses/gpl-3.0-standalone.html
77
*/
88
?>
@@ -67,6 +67,8 @@
6767
</p>
6868

6969
<p id="repositorios">
70+
<a href="https://gitlab.com/fryntiz" title="Repositorios Oficiales de Raúl Caro Pastorino" target="_blank">Repositorios en GitLab Oficial del desarrollador</a>
71+
7072
<a href="https://github.com/fryntiz" title="Repositorios Oficiales de Raúl Caro Pastorino" target="_blank">Repositorios en GitHub Oficial del desarrollador</a>
7173
</p>
7274

‎Apache2/www/html/scripts.js renamed to ‎Apache2/www/default/scripts.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
22
* @author Raúl Caro Pastorino
3-
* @copyright Copyright © 2017 Raúl Caro Pastorino
3+
* @copyright Copyright © 2019 Raúl Caro Pastorino
44
* @license https://www.gnu.org/licenses/gpl-3.0-standalone.html
55
*/

‎Apache2/www/html/styles.css renamed to ‎Apache2/www/default/styles.css

File renamed without changes.

‎Apache2/www/html/Privado/.htaccess renamed to ‎Apache2/www/private/.htaccess

File renamed without changes.

‎Apache2/www/html/Privado/CMS/.htaccess renamed to ‎Apache2/www/private/CMS/.htaccess

File renamed without changes.

‎Apache2/www/html/Privado/CMS/index.php renamed to ‎Apache2/www/private/CMS/index.php

File renamed without changes.

‎Apache2/www/html/Publico/.htaccess renamed to ‎Apache2/www/public/.htaccess

File renamed without changes.

‎Apache2/www/html/Publico/default/index.html renamed to ‎Apache2/www/public/default/index.html

File renamed without changes.

‎Apache2/www/html/Publico/default/scripts.js renamed to ‎Apache2/www/public/default/scripts.js

File renamed without changes.

‎Apache2/www/html/Publico/default/styles.css renamed to ‎Apache2/www/public/default/styles.css

File renamed without changes.

‎Apps/0_Main.sh

+61-11
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,21 @@
2525
############################
2626
source "$WORKSCRIPT/Apps/1_Aplicaciones_Basicas.sh"
2727
source "$WORKSCRIPT/Apps/2_Aplicaciones_Extras.sh"
28+
source "$WORKSCRIPT/Apps/desarrollo.sh"
29+
source "$WORKSCRIPT/Apps/firmware.sh"
30+
source "$WORKSCRIPT/Apps/flatpak.sh"
31+
source "$WORKSCRIPT/Apps/grafico.sh"
32+
source "$WORKSCRIPT/Apps/herramientas.sh"
33+
source "$WORKSCRIPT/Apps/internet.sh"
34+
source "$WORKSCRIPT/Apps/juegos.sh"
35+
source "$WORKSCRIPT/Apps/ofimatica.sh"
36+
source "$WORKSCRIPT/Apps/pentesting.sh"
37+
source "$WORKSCRIPT/Apps/servidor-grafico.sh"
38+
source "$WORKSCRIPT/Apps/sonido.sh"
39+
source "$WORKSCRIPT/Apps/video.sh"
40+
source "$WORKSCRIPT/Apps/virtualizacion.sh"
41+
source "$WORKSCRIPT/Apps/vps.sh"
2842
source "$WORKSCRIPT/Apps/IDEs/0_Main.sh"
29-
source "$WORKSCRIPT/Apps/Packages/0_Main.sh"
3043

3144
############################
3245
## FUNCIONES ##
@@ -40,8 +53,19 @@ menuAplicaciones() {
4053
clear
4154
echo -e "$VE Instalando todas las aplicaciones$CL"
4255
aplicaciones_basicas
43-
aplicaciones_extras -a
44-
#menuIDES -a
56+
aplicaciones_firmware
57+
aplicaciones_desarrollo
58+
aplicaciones_grafico
59+
aplicaciones_herramientas
60+
aplicaciones_internet
61+
aplicaciones_juegos
62+
aplicaciones_ofimatica
63+
aplicaciones_pentesting
64+
aplicaciones_servidor_grafico
65+
aplicaciones_sonido
66+
aplicaciones_video
67+
aplicaciones_virtualizacion
68+
4569
menuPaquetes -a
4670
}
4771

@@ -53,12 +77,25 @@ menuAplicaciones() {
5377
clear
5478
local descripcion='Menú de aplicaciones
5579
1) Aplicaciones Básicas
56-
2) Aplicaciones Extras
57-
3) Instalar Grupo de aplicaciones
80+
2) Firmware
81+
3) Desarrollo
82+
4) Diseño Gráfico
83+
5) Herramientas
84+
6) Internet
85+
7) Juegos
86+
8) Ofimática
87+
9) Pentesting
88+
10) Servidor Gráfico
89+
11) Sonido
90+
12) Vídeo
91+
13) Virtualización
5892
59-
4) Todos los pasos anteriores completos
93+
14) Todos los pasos anteriores completos
6094
61-
5) Instalar IDEs
95+
15) Instalar IDEs
96+
16) Instalar Aplicaciones Extras
97+
17) Flatpak
98+
18) VPS
6299
63100
0) Atrás
64101
'
@@ -71,10 +108,23 @@ menuAplicaciones() {
71108
case $entrada in
72109

73110
1) aplicaciones_basicas;; ## Aplicaciones Básicas
74-
2) aplicaciones_extras;; ## Aplicaciones Extras
75-
3) menuPaquetes;; ## Aplicaciones de por lotes
76-
4) todas_aplicaciones;; ## Todas las aplicaciones
77-
5) menuIDES ## Menú para instalar IDEs
111+
2) aplicaciones_firmware;;
112+
3) aplicaciones_desarrollo;;
113+
4) aplicaciones_grafico;;
114+
5) aplicaciones_herramientas;;
115+
6) aplicaciones_internet;;
116+
7) aplicaciones_juegos;;
117+
8) aplicaciones_ofimatica;;
118+
9) aplicaciones_pentesting;;
119+
10) aplicaciones_servidor_grafico;;
120+
11) aplicaciones_sonido;;
121+
12) aplicaciones_video;;
122+
13) aplicaciones_virtualizacion;;
123+
14) todas_aplicaciones;; ## Todas las aplicaciones
124+
15) menuIDES;; ## Menú para instalar IDEs
125+
16) aplicaciones_extras;; ## Aplicaciones Extras
126+
17) aplicaciones_flatpak;;
127+
18) aplicaciones_vps
78128
break;;
79129

80130
0) ## SALIR

‎Apps/1_Aplicaciones_Basicas.sh

+8-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,14 @@ aplicaciones_basicas() {
3030

3131
repararGestorPaquetes
3232

33-
instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/Software-Basico.lst"
33+
instalarSoftwareLista "$SOFTLIST/Basico/audio.lst"
34+
instalarSoftwareLista "$SOFTLIST/Basico/compresores.lst"
35+
instalarSoftwareLista "$SOFTLIST/Basico/firewall.lst"
36+
instalarSoftwareLista "$SOFTLIST/Basico/herramientas.lst"
37+
instalarSoftwareLista "$SOFTLIST/Basico/internet.lst"
38+
instalarSoftwareLista "$SOFTLIST/Basico/monitores.lst"
39+
instalarSoftwareLista "$SOFTLIST/Basico/terminal.lst"
40+
instalarSoftwareLista "$SOFTLIST/Basico/tipografias.lst"
3441

3542
repararGestorPaquetes
3643
}

‎Apps/3_Aplicaciones_Usuario.sh

-5
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,4 @@ source "$WORKSCRIPT/Apps/vim.sh"
3232
############################
3333
aplicaciones_usuarios() {
3434
echo -e "$VE Instalando Aplicaciones específicas para el usuario$RO $USER$CL"
35-
36-
37-
38-
39-
4035
}

‎Apps/Firefox.sh

+2
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,6 @@ firefox_instalador() {
140140
## Instalar Versiones de Firefox
141141
firefox_developer
142142
firefox_nightly
143+
144+
exit 1
143145
}

‎Apps/IDEs/phpstorm.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ phpstorm_postconfiguracion() {
7575
}
7676

7777
phpstorm_instalador() {
78-
local version='PhpStorm-2018.2.4'
78+
local version='PhpStorm-2019.1'
7979

8080
echo -e "$VE Comenzando instalación de$RO PhpStorm$CL"
8181

‎Apps/IDEs/pycharm_pro.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pycharm_postconfiguracion() {
7272
}
7373

7474
pycharm_pro_instalador() {
75-
local version='pycharm-professional-2018.2.4'
75+
local version='pycharm-professional-2019.1.1'
7676

7777
echo -e "$VE Comenzando instalación de$RO PyCharm$CL"
7878

0 commit comments

Comments
 (0)