diff options
Diffstat (limited to 'sanitycheck/pnfsimulator-secured')
5 files changed, 16 insertions, 7 deletions
diff --git a/sanitycheck/pnfsimulator-secured/certservice/docker-compose-certservice-clients.yml b/sanitycheck/pnfsimulator-secured/certservice/docker-compose-certservice-clients.yml index a7b19e4..60cc553 100644 --- a/sanitycheck/pnfsimulator-secured/certservice/docker-compose-certservice-clients.yml +++ b/sanitycheck/pnfsimulator-secured/certservice/docker-compose-certservice-clients.yml @@ -6,7 +6,7 @@ networks: services: oom-cert-client-ves: - image: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.1.0 + image: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.1.1 container_name: oomcert-client-for-ves env_file: ./resources/certservice-client/client-configuration-for-ves.env networks: @@ -17,7 +17,7 @@ services: - ./resources/certs/certServiceClient-keystore.jks:/etc/onap/oom/certservice/certs/certServiceClient-keystore.jks oom-cert-client-pnfsim: - image: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.1.0 + image: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.1.1 container_name: oomcert-client env_file: ./resources/certservice-client/client-configuration-for-pnfsim.env networks: @@ -28,7 +28,7 @@ services: - ./resources/certs/certServiceClient-keystore.jks:/etc/onap/oom/certservice/certs/certServiceClient-keystore.jks oom-cert-client-httpserver: - image: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.1.0 + image: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.1.1 container_name: oomcert-client-for-httpserver env_file: ./resources/certservice-client/client-configuration-for-httpserver.env networks: diff --git a/sanitycheck/pnfsimulator-secured/certservice/docker-compose-certservice-ejbca.yml b/sanitycheck/pnfsimulator-secured/certservice/docker-compose-certservice-ejbca.yml index 38b130f..a400eb9 100644 --- a/sanitycheck/pnfsimulator-secured/certservice/docker-compose-certservice-ejbca.yml +++ b/sanitycheck/pnfsimulator-secured/certservice/docker-compose-certservice-ejbca.yml @@ -27,7 +27,7 @@ services: - onap oom-cert-service: - image: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-api:2.1.0 + image: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-api:2.1.1 volumes: - ./resources/certservice/cmpServers.json:/etc/onap/oom/certservice/cmpServers.json - ./resources/certs/truststore.jks:/etc/onap/oom/certservice/certs/truststore.jks diff --git a/sanitycheck/pnfsimulator-secured/certservice/docker-compose-pnfsim.yml b/sanitycheck/pnfsimulator-secured/certservice/docker-compose-pnfsim.yml index b52523e..1875598 100644 --- a/sanitycheck/pnfsimulator-secured/certservice/docker-compose-pnfsim.yml +++ b/sanitycheck/pnfsimulator-secured/certservice/docker-compose-pnfsim.yml @@ -38,14 +38,16 @@ services: http-server: image: nexus3.onap.org:10003/onap/org.onap.integration.simulators.httpserver ports: - - "7080:80" - - "7443:443" + - "8080:8080" + - "32000:32000" + - "32080:80" + - "32100:32100" + - "32443:443" networks: - pnfsimulator - public volumes: - ~/httpservervolumes/:/usr/local/apache2/htdocs - - ../../../httpserver/resources/.htaccess:/usr/local/apache2/htdocs/.htaccess - ../../../httpserver/logs:/var/log/apache2 - ./resources/certservice-client/client-volume-for-httpserver/:/etc/apache2/certs/ command: bash -c " @@ -53,6 +55,7 @@ services: while [[ $$(ls -1 /etc/apache2/certs/ | wc -l) != '3' ]]; do echo 'Waiting for certs...'; sleep 3; done; chmod 777 /usr/local/apache2/htdocs; cp /usr/local/apache2/conf/upload.php /usr/local/apache2/htdocs/upload.php; + touch /usr/local/apache2/htdocs/index.html; /usr/sbin/apache2ctl -D FOREGROUND; " restart: on-failure diff --git a/sanitycheck/pnfsimulator-secured/certservice/resources/certs/.gitignore b/sanitycheck/pnfsimulator-secured/certservice/resources/certs/.gitignore new file mode 100644 index 0000000..385dcde --- /dev/null +++ b/sanitycheck/pnfsimulator-secured/certservice/resources/certs/.gitignore @@ -0,0 +1,3 @@ +*.jks +*.p12 +*.crt diff --git a/sanitycheck/pnfsimulator-secured/certservice/resources/certservice-client/.gitignore b/sanitycheck/pnfsimulator-secured/certservice/resources/certservice-client/.gitignore new file mode 100644 index 0000000..d7424ab --- /dev/null +++ b/sanitycheck/pnfsimulator-secured/certservice/resources/certservice-client/.gitignore @@ -0,0 +1,3 @@ +client-volume-for-httpserver +client-volume-for-pnfsim +client-volume-for-ves |