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‎

Lines changed: 1 addition & 0 deletions
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‎

Lines changed: 30 additions & 0 deletions
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 4 additions & 4 deletions
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‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

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

Lines changed: 5 additions & 5 deletions
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‎

Lines changed: 16 additions & 0 deletions
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

Lines changed: 5 additions & 5 deletions
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‎

Lines changed: 14 additions & 0 deletions
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

0 commit comments

Comments
 (0)