Skip to content

Commit 3177d86

Browse files
raupulusraupulus
authored
Merge pull request #187 from fryntiz/dev
Versión 0.8.4
2 parents 2dd6952 + 1396dca commit 3177d86

Some content is hidden

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

53 files changed

+866
-160
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<VirtualHost *:80>
22
ServerName localhost
3-
ServerAdmin tecnico@fryntiz.es
3+
ServerAdmin dev@fryntiz.es
44

55
ErrorLog ${APACHE_LOG_DIR}/error.log
66
CustomLog ${APACHE_LOG_DIR}/access.log combined

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<VirtualHost *:443>
2+
ServerName dev.local
3+
ServerAdmin dev@fryntiz.es
4+
DocumentRoot /var/www/html/dev
5+
ErrorLog ${APACHE_LOG_DIR}/dev.local/ssl-error.log
6+
CustomLog ${APACHE_LOG_DIR}/dev.local/ssl-access.log combined
7+
<Directory /var/www/html/dev/>
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/dev.conf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<VirtualHost *:80>
2+
ServerName dev.local
3+
ServerAdmin dev@fryntiz.es
4+
5+
ErrorLog ${APACHE_LOG_DIR}/dev.local/error.log
6+
CustomLog ${APACHE_LOG_DIR}/dev.local/access.log combined
7+
8+
DocumentRoot /var/www/html/dev
9+
<Directory /var/www/html/dev/>
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/plantilla-ssl.conf

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<VirtualHost *:443>
2+
ServerName plantilla.local
3+
ServerAdmin dev@fryntiz.es
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/>
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 privado.local
30+
#ServerAlias www.privado.local

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<VirtualHost *:80>
2+
ServerName plantilla.local
3+
ServerAdmin dev@fryntiz.es
4+
5+
ErrorLog ${APACHE_LOG_DIR}/plantilla.local/error.log
6+
CustomLog ${APACHE_LOG_DIR}/plantilla.local/access.log combined
7+
8+
DocumentRoot /var/www/html/plantilla
9+
<Directory /var/www/html/plantilla/>
10+
AllowOverride All
11+
</Directory>
12+
</VirtualHost>
13+
14+
#Algunas directivas útiles:
15+
#ServerAlias plantilla.local
16+
#ServerAlias www.plantilla.local

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<VirtualHost *:443>
2+
ServerName privado.local
3+
ServerAdmin dev@fryntiz.es
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/>
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 privado.local
30+
#ServerAlias www.privado.local

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<VirtualHost *:80>
22
ServerName privado.local
3-
ServerAdmin tecnico@fryntiz.es
3+
ServerAdmin dev@fryntiz.es
44

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

88
DocumentRoot /var/www/html/Privado
99
<Directory /var/www/html/Privado/>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<VirtualHost *:443>
2+
ServerName publico.local
3+
ServerAdmin dev@fryntiz.es
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/>
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 publico.local
30+
#ServerAlias www.publico.local

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<VirtualHost *:80>
22
ServerName publico.local
3-
ServerAdmin tecnico@fryntiz.es
3+
ServerAdmin dev@fryntiz.es
44

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

88
DocumentRoot /var/www/html/Publico
99
</VirtualHost>

‎Apps/0_Main.sh

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
############################
2626
source "$WORKSCRIPT/Apps/1_Aplicaciones_Basicas.sh"
2727
source "$WORKSCRIPT/Apps/2_Aplicaciones_Extras.sh"
28-
source "$WORKSCRIPT/Apps/3_Aplicaciones_Usuario.sh"
2928
source "$WORKSCRIPT/Apps/IDEs/0_Main.sh"
3029
source "$WORKSCRIPT/Apps/Packages/0_Main.sh"
3130

@@ -42,7 +41,6 @@ menuAplicaciones() {
4241
echo -e "$VE Instalando todas las aplicaciones$CL"
4342
aplicaciones_basicas
4443
aplicaciones_extras -a
45-
aplicaciones_usuarios
4644
#menuIDES -a
4745
menuPaquetes -a
4846
}
@@ -56,12 +54,11 @@ menuAplicaciones() {
5654
local descripcion='Menú de aplicaciones
5755
1) Aplicaciones Básicas
5856
2) Aplicaciones Extras
59-
3) Aplicaciones de Usuario
60-
4) Instalar Grupo de aplicaciones
57+
3) Instalar Grupo de aplicaciones
6158
62-
5) Todos los pasos anteriores completos
59+
4) Todos los pasos anteriores completos
6360
64-
6) Instalar IDEs
61+
5) Instalar IDEs
6562
6663
0) Atrás
6764
'
@@ -75,10 +72,9 @@ menuAplicaciones() {
7572

7673
1) aplicaciones_basicas;; ## Aplicaciones Básicas
7774
2) aplicaciones_extras;; ## Aplicaciones Extras
78-
3) aplicaciones_usuarios;; ## Aplicaciones de Usuario
79-
4) menuPaquetes;; ## Aplicaciones de por lotes
80-
5) todas_aplicaciones;; ## Todas las aplicaciones
81-
6) menuIDES ## Menú para instalar IDEs
75+
3) menuPaquetes;; ## Aplicaciones de por lotes
76+
4) todas_aplicaciones;; ## Todas las aplicaciones
77+
5) menuIDES ## Menú para instalar IDEs
8278
break;;
8379

8480
0) ## SALIR

‎Apps/3_Aplicaciones_Usuario.sh

Lines changed: 2 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -30,66 +30,11 @@ source "$WORKSCRIPT/Apps/vim.sh"
3030
############################
3131
## FUNCIONES ##
3232
############################
33-
34-
35-
##
36-
## Mi generador de proyectos https://github.com/fryntiz/Generador_Proyectos.git
37-
## Este generador de proyectos crea un script que permite generar la estructura
38-
## para los proyectos más recurridos por mi (php, python, bash....) y después
39-
## pregunta si subirlo automáticamente a GitHub
40-
##
41-
generador_proyectos() {
42-
descargarGIT 'Generador de Proyectos' 'https://github.com/fryntiz/Generador_Proyectos.git' "$WORKSCRIPT/tmp/Generador_Proyectos"
43-
44-
cd "$WORKSCRIPT/tmp/Generador_Proyectos" || return 1 && ./instalar.sh
45-
cd "$WORKSCRIPT" || exit
46-
}
47-
48-
##
49-
## Crea un comando para generar plantillas de archivos
50-
##
51-
generador_plantillas() {
52-
enlazarHome '.local/bin/nuevo'
53-
sudo chmod 755 "/home/${USER}/.local/bin/nuevo"
54-
sudo chown ${USER}:${USER} "/home/${USER}/.local/bin/nuevo"
55-
}
56-
57-
devicons_ls() {
58-
descargarGIT 'devicons-ls' 'https://github.com/ryanoasis/devicons-shell.git' "$WORKSCRIPT/tmp/devicons-shell"
59-
60-
if [[ -f "$HOME/.local/bin/devicons-ls" ]]; then
61-
rm -f "$HOME/.local/bin/devicons-ls"
62-
fi
63-
64-
cp "$WORKSCRIPT/tmp/devicons-shell/devicons-ls" "$HOME/.local/bin/devicons-ls"
65-
}
66-
6733
aplicaciones_usuarios() {
6834
echo -e "$VE Instalando Aplicaciones específicas para el usuario$RO $USER$CL"
69-
bashit_Instalador
70-
ohmyzsh_Instalador
7135

72-
while true; do
73-
echo -e "$VE ¿Quieres instalar$RO vim$VE o$RO spacevim$CL"
74-
echo -e "$RO 1)$VE vim$CL"
75-
echo -e "$RO 2)$VE spacevim$CL"
76-
read -p "→ " editor
77-
case "$editor" in
78-
vim | 1)
79-
vim_Instalador
80-
break;;
81-
spacevim | 2)
82-
spacevim_Instalador
83-
break;;
84-
*) ## Opción errónea
85-
clear
86-
echo -e "$RO Opción no válida$CL"
87-
esac
88-
done
8936

90-
devicons_ls
9137

92-
## Mis propias aplicaciones
93-
generador_proyectos
94-
generador_plantillas
38+
39+
9540
}

‎Apps/IDEs/Atom_IDE.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,16 @@ atom_postconfiguracion() {
6767

6868
echo -e "$VE Deshabilitando complementos$CL"
6969
apm disable welcome metrics
70+
71+
## Instalando php-integrator-core 2.1.7 para php <7.1
72+
echo -e "$VE Instalando$RO php-integrator-core 2.1.7$VE"
73+
if [[ -d "$HOME/.atom/packages/php-integrator-base-legacy-php56/core/2.1.7" ]]; then
74+
rm -R -f "$HOME/.atom/packages/php-integrator-base-legacy-php56/core/2.1.7"
75+
fi
76+
descargarGIT 'php-integrator-core' 'https://gitlab.com/Serenata/Serenata' "$HOME/.atom/packages/php-integrator-base-legacy-php56/core/2.1.7"
77+
cd "$HOME/.atom/packages/php-integrator-base-legacy-php56/core/2.1.7" || exit 1
78+
git checkout b84807f33b77868f115332850113babab095c964
79+
composer install
7080
}
7181

7282
atom_plugins() {

‎Apps/IDEs/Atom_Paquetes.lst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ whitespace
1919
autocomplete-css
2020
autocomplete-html
2121
toggle-quotes
22-
console-log-atom
22+
console-log
2323
file-icons
2424
pigments
2525
linter-eslint
2626
autocomplete-modules
2727
atom-css-clean
28-
platformio-atom-ide-terminal
28+
platformio-ide-terminal
2929
docblockr
3030
emmet
3131
ide-php
@@ -43,3 +43,4 @@ php-integrator-refactoring-legacy-php56
4343
php-integrator-tooltips-legacy-php56
4444
hyperclick
4545
atom-bootstrap3
46+
ftp-remote-edit

‎Apps/IDEs/phpstorm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ phpstorm_postconfiguracion() {
7575
}
7676

7777
phpstorm_instalador() {
78-
local version='PhpStorm-2018.1.6'
78+
local version='PhpStorm-2018.2.3'
7979

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

‎Desktops/0_Main.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ source "$WORKSCRIPT/Desktops/xmonad.sh"
2424
source "$WORKSCRIPT/Desktops/openbox.sh"
2525
source "$WORKSCRIPT/Desktops/gnome-shell.sh"
2626

27-
###########################
28-
## FUNCIONES ##
29-
###########################
27+
############################
28+
## FUNCIONES ##
29+
############################
3030
menuDesktops() {
3131
todos_desktops() {
3232
clear
@@ -45,9 +45,9 @@ menuDesktops() {
4545
local descripcion='Menú de Personalización del sistema
4646
1) Instalar i3wm
4747
2) Instalar Xmonad
48-
2) Instalar Openbox
49-
2) Instalar Gnome Shell
50-
3) Todos los pasos anteriores
48+
3) Instalar Openbox
49+
4) Instalar Gnome Shell
50+
5) Todos los pasos anteriores
5151
5252
0) Atrás
5353
'
@@ -62,7 +62,7 @@ menuDesktops() {
6262
2) xmonad_instalador;; ## Instala xmonad
6363
3) openbox_instalador;; ## Instala openbox
6464
4) gnome_shell_instalador;; ## Instala gnome shell
65-
3) todos_desktops;; ## Todos los pasos anteriores
65+
5) todos_desktops;; ## Todos los pasos anteriores
6666

6767
0) ## SALIR
6868
clear

0 commit comments

Comments
 (0)