From c3c8469f745073e8f156ca7fd839ef1a84e61ed4 Mon Sep 17 00:00:00 2001 From: German Martinez Date: Mon, 10 Jul 2017 03:06:52 +0200 Subject: [PATCH] Corrige errata --- nginx/default | 173 ------------------------- nginx/sites-available/default | 230 +++++++++++++++++++++++----------- 2 files changed, 154 insertions(+), 249 deletions(-) delete mode 100644 nginx/default diff --git a/nginx/default b/nginx/default deleted file mode 100644 index 3a0f97a..0000000 --- a/nginx/default +++ /dev/null @@ -1,173 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - root /var/www/html; - - server_name _; - - location / { - try_files $uri $uri/ =404; - autoindex on; - } - - location /ontology/ugr { - rewrite ^/ontology/ugr$ /ontology/ugr.ttl; - } - - location /resources/DemandaAcademicaAcceso/1213 { - rewrite ^/resources/DemandaAcademicaAcceso/1213$ /resources/DemandaAcademica/Acceso/DemandaAcademicaAcceso1213.rdf; - } - - location /resources/DemandaAcademicaAcceso/1314 { - rewrite ^/resources/DemandaAcademicaAcceso/1314$ /resources/DemandaAcademica/Acceso/DemandaAcademicaAcceso1314.rdf; - } - - location /resources/DemandaAcademicaAcceso/1415 { - rewrite ^/resources/DemandaAcademicaAcceso/1415$ /resources/DemandaAcademica/Acceso/DemandaAcademicaAcceso1415.rdf; - } - - location /resources/DemandaAcademicaTitulacion/1415 { - rewrite ^/resources/DemandaAcademicaTitulacion/1415$ /resources/DemandaAcademica/Titulacion/DemandaAcademicaTitulacion1415.rdf; - } - - location /resources/DemandaAcademicaTitulacion/1516 { - rewrite ^/resources/DemandaAcademicaTitulacion/1516$ /resources/DemandaAcademica/Titulacion/DemandaAcademicaTitulacion1516.rdf; - } - - location /resources/MatriculasGrado/1011 { - rewrite ^/resources/MatriculasGrado/1011$ /resources/Matriculas/Grado/MatriculasGrado1011.rdf; - } - - location /resources/MatriculasGrado/1112 { - rewrite ^/resources/MatriculasGrado/1112$ /resources/Matriculas/Grado/MatriculasGrado1112.rdf; - } - - location /resources/MatriculasGrado/1213 { - rewrite ^/resources/MatriculasGrado/1213$ /resources/Matriculas/Grado/MatriculasGrado1213.rdf; - } - - location /resources/MatriculasGrado/1314 { - rewrite ^/resources/MatriculasGrado/1314$ /resources/Matriculas/Grado/MatriculasGrado1314.rdf; - } - - location /resources/MatriculasGrado/1415 { - rewrite ^/resources/MatriculasGrado/1415$ /resources/Matriculas/Grado/MatriculasGrado1415.rdf; - } - - location /resources/MatriculasGrado/1516 { - rewrite ^/resources/MatriculasGrado/1516$ /resources/Matriculas/Grado/MatriculasGrado1516.rdf; - } - - location /resources/MatriculasPosgrado/1011 { - rewrite ^/resources/MatriculasPosgrado/1011$ /resources/Matriculas/Posgrado/MatriculasPosgrado1011.rdf; - } - - location /resources/MatriculasPosgrado/1112 { - rewrite ^/resources/MatriculasPosgrado/1112$ /resources/Matriculas/Posgrado/MatriculasPosgrado1112.rdf; - } - - location /resources/MatriculasPosgrado/1213 { - rewrite ^/resources/MatriculasPosgrado/1213$ /resources/Matriculas/Posgrado/MatriculasPosgrado1213.rdf; - } - - location /resources/MatriculasPosgrado/1314 { - rewrite ^/resources/MatriculasPosgrado/1314$ /resources/Matriculas/Posgrado/MatriculasPosgrado1314.rdf; - } - - location /resources/MatriculasPosgrado/1415 { - rewrite ^/resources/MatriculasPosgrado/1415$ /resources/Matriculas/Posgrado/MatriculasPosgrado1415.rdf; - } - - location /resources/MatriculasPosgrado/1516 { - rewrite ^/resources/MatriculasPosgrado/1516$ /resources/Matriculas/Posgrado/MatriculasPosgrado1516.rdf; - } - - location /resources/NumMedioCreditos/1213 { - rewrite ^/resources/NumMedioCreditos/1213$ /resources/NumMedioCreditos/NumMedioCreditos1213.rdf; - } - - location /resources/NumMedioCreditos/1314 { - rewrite ^/resources/NumMedioCreditos/1314$ /resources/NumMedioCreditos/NumMedioCreditos1314.rdf; - } - - location /resources/OfertaTitulacionDoctorado/1314 { - rewrite ^/resources/OfertaTitulacionDoctorado/1314$ /resources/OfertaTitulacion/Doctorado/OfertaTitulacionDoctorado1314.rdf; - } - - location /resources/OfertaTitulacionDoctorado/1415 { - rewrite ^/resources/OfertaTitulacionDoctorado/1415$ /resources/OfertaTitulacion/Doctorado/OfertaTitulacionDoctorado1415.rdf; - } - - location /resources/OfertaTitulacionDoctorado/1516 { - rewrite ^/resources/OfertaTitulacionDoctorado/1516$ /resources/OfertaTitulacion/Doctorado/OfertaTitulacionDoctorado1516.rdf; - } - - location /resources/OfertaTitulacionGrado/1314 { - rewrite ^/resources/OfertaTitulacionGrado/1314$ /resources/OfertaTitulacion/Grado/OfertaTitulacionGrado1314.rdf; - } - - location /resources/OfertaTitulacionGrado/1415 { - rewrite ^/resources/OfertaTitulacionGrado/1415$ /resources/OfertaTitulacion/Grado/OfertaTitulacionGrado1415.rdf; - } - - location /resources/OfertaTitulacionGrado/1516 { - rewrite ^/resources/OfertaTitulacionGrado/1516$ /resources/OfertaTitulacion/Grado/OfertaTitulacionGrado1516.rdf; - } - - location /resources/OfertaTitulacionMaster/1314 { - rewrite ^/resources/OfertaTitulacionMaster/1314$ /resources/OfertaTitulacion/Master/OfertaTitulacionMaster1314.rdf; - } - - location /resources/OfertaTitulacionMaster/1415 { - rewrite ^/resources/OfertaTitulacionMaster/1415$ /resources/OfertaTitulacion/Master/OfertaTitulacionMaster1415.rdf; - } - - location /resources/OfertaTitulacionMaster/1516 { - rewrite ^/resources/OfertaTitulacionMaster/1516$ /resources/OfertaTitulacion/Master/OfertaTitulacionMaster1516.rdf; - } - - location /resources/OrigenPais/1314 { - rewrite ^/resources/OrigenPais/1314$ /resources/OrigenGeografico/Pais/OrigenPais1314.rdf; - } - - location /resources/OrigenPais/1415 { - rewrite ^/resources/OrigenPais/1415$ /resources/OrigenGeografico/Pais/OrigenPais1415.rdf; - } - - location /resources/OrigenPais/1516 { - rewrite ^/resources/OrigenPais/1516$ /resources/OrigenGeografico/Pais/OrigenPais1516.rdf; - } - - location /resources/OrigenProvincia/1314 { - rewrite ^/resources/OrigenProvincia/1314$ /resources/OrigenGeografico/Provincia/OrigenProvincia1314.rdf; - } - - location /resources/OrigenProvincia/1415 { - rewrite ^/resources/OrigenProvincia/1415$ /resources/OrigenGeografico/Provincia/OrigenProvincia1415.rdf; - } - - location /resources/OrigenProvincia/1516 { - rewrite ^/resources/OrigenProvincia/1516$ /resources/OrigenGeografico/Provincia/OrigenProvincia1516.rdf; - } - - location /resources/TasasAcademicasTitulacion/1112 { - rewrite ^/resources/TasasAcademicasTitulacion/1112$ /resources/TasasAcademicas/Titulacion/TasasAcademicasTitulacion1112.rdf; - } - - location /resources/TasasAcademicasTitulacion/1213 { - rewrite ^/resources/TasasAcademicasTitulacion/1213$ /resources/TasasAcademicas/Titulacion/TasasAcademicasTitulacion1213.rdf; - } - - location /resources/TasasAcademicasTitulacion/1314 { - rewrite ^/resources/TasasAcademicasTitulacion/1314$ /resources/TasasAcademicas/Titulacion/TasasAcademicasTitulacion1314.rdf; - } - - location /resources/TasasAcademicasTitulacion/1415 { - rewrite ^/resources/TasasAcademicasTitulacion/1415$ /resources/TasasAcademicas/Titulacion/TasasAcademicasTitulacion1415.rdf; - } - - location /resources/TasasAcademicasTitulacion/1516 { - rewrite ^/resources/TasasAcademicasTitulacion/1516$ /resources/TasasAcademicas/Titulacion/TasasAcademicasTitulacion1516.rdf; - } -} diff --git a/nginx/sites-available/default b/nginx/sites-available/default index afa2609..3a0f97a 100644 --- a/nginx/sites-available/default +++ b/nginx/sites-available/default @@ -1,52 +1,12 @@ -## -# You should look at the following URL's in order to grasp a solid understanding -# of Nginx configuration files in order to fully unleash the power of Nginx. -# http://wiki.nginx.org/Pitfalls -# http://wiki.nginx.org/QuickStart -# http://wiki.nginx.org/Configuration -# -# Generally, you will want to move this file somewhere, and start with a clean -# file but keep this around for reference. Or just disable in sites-enabled. -# -# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples. -## - -# Default server configuration -# server { listen 80 default_server; listen [::]:80 default_server; - # SSL configuration - # - # listen 443 ssl default_server; - # listen [::]:443 ssl default_server; - # - # Note: You should disable gzip for SSL traffic. - # See: https://bugs.debian.org/773332 - # - # Read up on ssl_ciphers to ensure a secure configuration. - # See: https://bugs.debian.org/765782 - # - # Self signed certs generated by the ssl-cert package - # Don't use them in a production server! - # - # include snippets/snakeoil.conf; - root /var/www/html; - # Add index.php to the list if you are using PHP - index index.html index.htm index.nginx-debian.html; - server_name _; location / { - # First attempt to serve request as file, then - # as directory, then fall back to displaying a 404. - try_files $uri $uri/ =404; - } - - location /ontology/ { try_files $uri $uri/ =404; autoindex on; } @@ -55,41 +15,159 @@ server { rewrite ^/ontology/ugr$ /ontology/ugr.ttl; } - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # include snippets/fastcgi-php.conf; - # - # # With php7.0-cgi alone: - # fastcgi_pass 127.0.0.1:9000; - # # With php7.0-fpm: - # fastcgi_pass unix:/run/php/php7.0-fpm.sock; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - #location ~ /\.ht { - # deny all; - #} -} + location /resources/DemandaAcademicaAcceso/1213 { + rewrite ^/resources/DemandaAcademicaAcceso/1213$ /resources/DemandaAcademica/Acceso/DemandaAcademicaAcceso1213.rdf; + } + location /resources/DemandaAcademicaAcceso/1314 { + rewrite ^/resources/DemandaAcademicaAcceso/1314$ /resources/DemandaAcademica/Acceso/DemandaAcademicaAcceso1314.rdf; + } + + location /resources/DemandaAcademicaAcceso/1415 { + rewrite ^/resources/DemandaAcademicaAcceso/1415$ /resources/DemandaAcademica/Acceso/DemandaAcademicaAcceso1415.rdf; + } + + location /resources/DemandaAcademicaTitulacion/1415 { + rewrite ^/resources/DemandaAcademicaTitulacion/1415$ /resources/DemandaAcademica/Titulacion/DemandaAcademicaTitulacion1415.rdf; + } + + location /resources/DemandaAcademicaTitulacion/1516 { + rewrite ^/resources/DemandaAcademicaTitulacion/1516$ /resources/DemandaAcademica/Titulacion/DemandaAcademicaTitulacion1516.rdf; + } + + location /resources/MatriculasGrado/1011 { + rewrite ^/resources/MatriculasGrado/1011$ /resources/Matriculas/Grado/MatriculasGrado1011.rdf; + } + + location /resources/MatriculasGrado/1112 { + rewrite ^/resources/MatriculasGrado/1112$ /resources/Matriculas/Grado/MatriculasGrado1112.rdf; + } + + location /resources/MatriculasGrado/1213 { + rewrite ^/resources/MatriculasGrado/1213$ /resources/Matriculas/Grado/MatriculasGrado1213.rdf; + } + + location /resources/MatriculasGrado/1314 { + rewrite ^/resources/MatriculasGrado/1314$ /resources/Matriculas/Grado/MatriculasGrado1314.rdf; + } + + location /resources/MatriculasGrado/1415 { + rewrite ^/resources/MatriculasGrado/1415$ /resources/Matriculas/Grado/MatriculasGrado1415.rdf; + } + + location /resources/MatriculasGrado/1516 { + rewrite ^/resources/MatriculasGrado/1516$ /resources/Matriculas/Grado/MatriculasGrado1516.rdf; + } + + location /resources/MatriculasPosgrado/1011 { + rewrite ^/resources/MatriculasPosgrado/1011$ /resources/Matriculas/Posgrado/MatriculasPosgrado1011.rdf; + } + + location /resources/MatriculasPosgrado/1112 { + rewrite ^/resources/MatriculasPosgrado/1112$ /resources/Matriculas/Posgrado/MatriculasPosgrado1112.rdf; + } + + location /resources/MatriculasPosgrado/1213 { + rewrite ^/resources/MatriculasPosgrado/1213$ /resources/Matriculas/Posgrado/MatriculasPosgrado1213.rdf; + } + + location /resources/MatriculasPosgrado/1314 { + rewrite ^/resources/MatriculasPosgrado/1314$ /resources/Matriculas/Posgrado/MatriculasPosgrado1314.rdf; + } + + location /resources/MatriculasPosgrado/1415 { + rewrite ^/resources/MatriculasPosgrado/1415$ /resources/Matriculas/Posgrado/MatriculasPosgrado1415.rdf; + } + + location /resources/MatriculasPosgrado/1516 { + rewrite ^/resources/MatriculasPosgrado/1516$ /resources/Matriculas/Posgrado/MatriculasPosgrado1516.rdf; + } + + location /resources/NumMedioCreditos/1213 { + rewrite ^/resources/NumMedioCreditos/1213$ /resources/NumMedioCreditos/NumMedioCreditos1213.rdf; + } + + location /resources/NumMedioCreditos/1314 { + rewrite ^/resources/NumMedioCreditos/1314$ /resources/NumMedioCreditos/NumMedioCreditos1314.rdf; + } -# Virtual Host configuration for example.com -# -# You can move that to a different file under sites-available/ and symlink that -# to sites-enabled/ to enable it. -# -#server { -# listen 80; -# listen [::]:80; -# -# server_name example.com; -# -# root /var/www/example.com; -# index index.html; -# -# location / { -# try_files $uri $uri/ =404; -# } -#} + location /resources/OfertaTitulacionDoctorado/1314 { + rewrite ^/resources/OfertaTitulacionDoctorado/1314$ /resources/OfertaTitulacion/Doctorado/OfertaTitulacionDoctorado1314.rdf; + } + + location /resources/OfertaTitulacionDoctorado/1415 { + rewrite ^/resources/OfertaTitulacionDoctorado/1415$ /resources/OfertaTitulacion/Doctorado/OfertaTitulacionDoctorado1415.rdf; + } + + location /resources/OfertaTitulacionDoctorado/1516 { + rewrite ^/resources/OfertaTitulacionDoctorado/1516$ /resources/OfertaTitulacion/Doctorado/OfertaTitulacionDoctorado1516.rdf; + } + + location /resources/OfertaTitulacionGrado/1314 { + rewrite ^/resources/OfertaTitulacionGrado/1314$ /resources/OfertaTitulacion/Grado/OfertaTitulacionGrado1314.rdf; + } + + location /resources/OfertaTitulacionGrado/1415 { + rewrite ^/resources/OfertaTitulacionGrado/1415$ /resources/OfertaTitulacion/Grado/OfertaTitulacionGrado1415.rdf; + } + + location /resources/OfertaTitulacionGrado/1516 { + rewrite ^/resources/OfertaTitulacionGrado/1516$ /resources/OfertaTitulacion/Grado/OfertaTitulacionGrado1516.rdf; + } + + location /resources/OfertaTitulacionMaster/1314 { + rewrite ^/resources/OfertaTitulacionMaster/1314$ /resources/OfertaTitulacion/Master/OfertaTitulacionMaster1314.rdf; + } + + location /resources/OfertaTitulacionMaster/1415 { + rewrite ^/resources/OfertaTitulacionMaster/1415$ /resources/OfertaTitulacion/Master/OfertaTitulacionMaster1415.rdf; + } + + location /resources/OfertaTitulacionMaster/1516 { + rewrite ^/resources/OfertaTitulacionMaster/1516$ /resources/OfertaTitulacion/Master/OfertaTitulacionMaster1516.rdf; + } + + location /resources/OrigenPais/1314 { + rewrite ^/resources/OrigenPais/1314$ /resources/OrigenGeografico/Pais/OrigenPais1314.rdf; + } + + location /resources/OrigenPais/1415 { + rewrite ^/resources/OrigenPais/1415$ /resources/OrigenGeografico/Pais/OrigenPais1415.rdf; + } + + location /resources/OrigenPais/1516 { + rewrite ^/resources/OrigenPais/1516$ /resources/OrigenGeografico/Pais/OrigenPais1516.rdf; + } + + location /resources/OrigenProvincia/1314 { + rewrite ^/resources/OrigenProvincia/1314$ /resources/OrigenGeografico/Provincia/OrigenProvincia1314.rdf; + } + + location /resources/OrigenProvincia/1415 { + rewrite ^/resources/OrigenProvincia/1415$ /resources/OrigenGeografico/Provincia/OrigenProvincia1415.rdf; + } + + location /resources/OrigenProvincia/1516 { + rewrite ^/resources/OrigenProvincia/1516$ /resources/OrigenGeografico/Provincia/OrigenProvincia1516.rdf; + } + + location /resources/TasasAcademicasTitulacion/1112 { + rewrite ^/resources/TasasAcademicasTitulacion/1112$ /resources/TasasAcademicas/Titulacion/TasasAcademicasTitulacion1112.rdf; + } + + location /resources/TasasAcademicasTitulacion/1213 { + rewrite ^/resources/TasasAcademicasTitulacion/1213$ /resources/TasasAcademicas/Titulacion/TasasAcademicasTitulacion1213.rdf; + } + + location /resources/TasasAcademicasTitulacion/1314 { + rewrite ^/resources/TasasAcademicasTitulacion/1314$ /resources/TasasAcademicas/Titulacion/TasasAcademicasTitulacion1314.rdf; + } + + location /resources/TasasAcademicasTitulacion/1415 { + rewrite ^/resources/TasasAcademicasTitulacion/1415$ /resources/TasasAcademicas/Titulacion/TasasAcademicasTitulacion1415.rdf; + } + + location /resources/TasasAcademicasTitulacion/1516 { + rewrite ^/resources/TasasAcademicasTitulacion/1516$ /resources/TasasAcademicas/Titulacion/TasasAcademicasTitulacion1516.rdf; + } +}