Commit 07ea5ee2 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Redirige también subdominios concretos de redmic

See merge request redmic-project/gateway/nginx-proxy-https!19
parents 7e849771 dcf52394

deploy/config/conf.d/dev-redirect-redmic.conf

+2 −2
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ server { 
	access_log off;

	server_tokens off;



	server_name ~^redmic(\.grafcan\.es)$;

	return 301 https://ecomarcan$1$request_uri;

	server_name ~^(es\.|en\.|api\.)?redmic(\.grafcan\.es)$;

	return 301 https://$1ecomarcan$2$request_uri;

}

deploy/config/conf.d/pro-redirect-redmic.conf

+2 −2
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ server { 
	access_log off;

	server_tokens off;



	server_name ~^redmic\.es$;

	return 301 https://ecomarcan.org$request_uri;

	server_name ~^(es\.|en\.|api\.)?redmic\.es$;

	return 301 https://$1ecomarcan.org$request_uri;

}