diff --git a/sigmah.sh b/sigmah.sh index 1005807..fa1a493 100755 --- a/sigmah.sh +++ b/sigmah.sh @@ -15,7 +15,7 @@ envsubst <${SOURCE_DIR}/createdb.sql | docker exec -i postgres psql # Configure Sigmah mkdir -p /srv/sigmah/conf /srv/sigmah/data/files /srv/sigmah/data/archives -chown -R 8015:8015 /srv/sigmah/data +chown -R 8011:8011 /srv/sigmah/data envsubst <${SOURCE_DIR}/srv/sigmah/conf/persistence.xml >/srv/sigmah/conf/persistence.xml cp ${SOURCE_DIR}/srv/sigmah/conf/sigmah.properties /srv/sigmah/conf/sigmah.properties docker run --rm -v /srv/sigmah/data:/srv/sigmah/data sigmah cp /srv/tomcat/webapps/sigmah/sigmah/images/header/org-default-logo.png /srv/sigmah/data/files/logo.png @@ -51,4 +51,4 @@ cp ${SOURCE_DIR}/etc/nginx/conf.d/sigmah.conf /etc/nginx/conf.d/sigmah.conf service nginx reload # Add portal application definition -portal-app-manager sigmah "https://{host}:8415/sigmah/" "${SIGMAH_ADMIN_EMAIL}" "${SIGMAH_ADMIN_PWD}" +portal-app-manager sigmah "https://{host}:8411/sigmah/" "${SIGMAH_ADMIN_EMAIL}" "${SIGMAH_ADMIN_PWD}" diff --git a/sigmah/Dockerfile b/sigmah/Dockerfile index 0f8f99d..3e50b41 100644 --- a/sigmah/Dockerfile +++ b/sigmah/Dockerfile @@ -12,10 +12,10 @@ RUN \ # Remove logging config && rm /srv/tomcat/webapps/sigmah/WEB-INF/classes/logback.xml \ # Configure Tomcat port - && sed -i 's/port="8080"/port="8015"/g' /srv/tomcat/conf/server.xml \ + && sed -i 's/port="8080"/port="8011"/g' /srv/tomcat/conf/server.xml \ # Create OS user - && addgroup -S -g 8015 sigmah \ - && adduser -S -u 8015 -h /srv/tomcat -s /bin/false -g sigmah -G sigmah sigmah \ + && addgroup -S -g 8011 sigmah \ + && adduser -S -u 8011 -h /srv/tomcat -s /bin/false -g sigmah -G sigmah sigmah \ && chown -R sigmah:sigmah /srv/tomcat/conf /srv/tomcat/logs /srv/tomcat/temp /srv/tomcat/webapps /srv/tomcat/work \ # Cleanup && rm /tmp/sigmah.war @@ -23,7 +23,7 @@ RUN \ COPY docker/ / VOLUME ["/srv/sigmah/data"] -EXPOSE 8015 +EXPOSE 8011 USER sigmah WORKDIR /srv/tomcat diff --git a/sigmah/etc/init.d/sigmah b/sigmah/etc/init.d/sigmah index 84b56ee..a24911c 100755 --- a/sigmah/etc/init.d/sigmah +++ b/sigmah/etc/init.d/sigmah @@ -13,7 +13,7 @@ start() { --name sigmah \ -h sigmah \ --link postgres \ - -p 127.0.0.1:9015:8015 \ + -p 127.0.0.1:9015:8011 \ -v /srv/sigmah/data:/srv/sigmah/data \ -v /srv/sigmah/conf/persistence.xml:/srv/tomcat/webapps/sigmah/WEB-INF/classes/META-INF/persistence.xml \ -v /srv/sigmah/conf/sigmah.properties:/srv/tomcat/webapps/sigmah/WEB-INF/classes/sigmah.properties \ diff --git a/sigmah/etc/nginx/conf.d/sigmah.conf b/sigmah/etc/nginx/conf.d/sigmah.conf index 53ba6d5..d39e384 100644 --- a/sigmah/etc/nginx/conf.d/sigmah.conf +++ b/sigmah/etc/nginx/conf.d/sigmah.conf @@ -1,6 +1,6 @@ server { - listen [::]:8015 ipv6only=off; - listen [::]:8415 ssl http2 ipv6only=off; + listen [::]:8011 ipv6only=off; + listen [::]:8411 ssl http2 ipv6only=off; access_log /var/log/nginx/sigmah.access.log; error_log /var/log/nginx/sigmah.error.log;