Merge branch 'master' of https://github.com/JonCook/tutorials

spring-cloud/spring-cloud-rest/application-config/discovery.properties

@@ -0,0 +1,16 @@
+spring.application.name=discovery
+server.port=8761
+
+#### cloud
+eureka.instance.hostname=localhost
+eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://system:systemPass@localhost:8761/eureka}
+eureka.client.registerWithEureka=false
+eureka.client.fetchRegistry=false
+
+#### security
+security.basic.enabled=true
+security.basic.path=/**
+security.user.name=system
+security.user.password=systemPass
+security.user.role=ADMIN
+security.sessions=always

spring-cloud/spring-cloud-rest/application-config/resource.properties

@@ -0,0 +1,20 @@
+spring.application.name=resource
+#server.port=0
+
+#### cloud
+eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://system:systemPass@localhost:8761/eureka}
+eureka.instance.preferIpAddress=true
+
+#### persistence
+spring.datasource.driver-class-name=org.h2.Driver
+spring.datasource.url=jdbc:h2:mem:cloud_rest;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.username=sa
+spring.datasource.password=
+
+#### security
+security.basic.enabled=true
+security.basic.path=/**
+security.user.name=user
+security.user.password=userPass
+security.user.role=USER
+security.sessions=always