Commit 34944f1d authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Aumenta tiempo de despliegue

See merge request redmic-project/server/api!8
parents e6049696 b1467432

.gitlab-ci.yml

+3 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ deploy-dev: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: api

    SERVICES_TO_CHECK: api_${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 300

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
@@ -157,6 +158,7 @@ deploy-supporting-branch: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: api

    SERVICES_TO_CHECK: api_${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 300

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
@@ -197,6 +199,7 @@ deploy-pro: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: api

    SERVICES_TO_CHECK: api_${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 300

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

src/main/java/es/redmic/api/config/Oauth2SecurityConfiguration.java

+8 −0
Original line number Diff line number Diff line
@@ -68,6 +68,14 @@ public class Oauth2SecurityConfiguration { 
					"#oauth2.hasScope('write') and "

					+ "hasAnyRole('ROLE_ADMINISTRATOR', 'ROLE_OAG', 'ROLE_COLLABORATOR')");



			http.authorizeRequests().antMatchers(HttpMethod.POST, "/mediastorage/uploads/users").access(

					"#oauth2.hasScope('read') or #oauth2.hasScope('write') and "

					+ "hasAnyRole('ROLE_ADMINISTRATOR', 'ROLE_OAG', 'ROLE_COLLABORATOR', 'ROLE_USER')");

			

			http.authorizeRequests().antMatchers(HttpMethod.GET, "/mediastorage/photobank/users/**").access(

					"#oauth2.hasScope('read') or #oauth2.hasScope('write') and "

					+ "hasAnyRole('ROLE_ADMINISTRATOR', 'ROLE_OAG', 'ROLE_COLLABORATOR', 'ROLE_USER')");

			

			http.authorizeRequests().antMatchers(HttpMethod.POST, "/mediastorage/**").access(

					"#oauth2.hasScope('read') or #oauth2.hasScope('write') and "

					+ "hasAnyRole('ROLE_ADMINISTRATOR', 'ROLE_OAG', 'ROLE_COLLABORATOR')");

src/main/resources/application-dev.properties

+3 −3
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ property.USER_API=http://213.0.110.84:8082 
property.SITEMAP_BASE_URL=https://appdev.redmic.net



#Mediastorage

#Base

property.path.media_storage.PRIVATE_BASE_PATH=/home/REDMIC/MEDIA_STORAGE

property.path.media_storage.PUBLIC_BASE_PATH=/home/REDMIC/PUBLIC_MEDIA_STORAGE

#S3

property.path.media_storage.PRIVATE_BASE_PATH=/private

property.path.media_storage.PUBLIC_BASE_PATH=/public



#Local private