diff --git a/seeddms.sh b/seeddms.sh index 63cf212..3184a57 100755 --- a/seeddms.sh +++ b/seeddms.sh @@ -33,12 +33,8 @@ cp ${SOURCE_DIR}/etc/init.d/seeddms /etc/init.d/seeddms rc-update add seeddms service seeddms start -# Create nginx app definition -cp ${SOURCE_DIR}/etc/nginx/conf.d/seeddms.conf /etc/nginx/conf.d/seeddms.conf -service nginx reload - # Install cron job cp ${SOURCE_DIR}/etc/periodic/hourly/seeddms /etc/periodic/hourly/seeddms -# Add portal application definition -portal-app-manager seeddms "https://{host}:8410/" "${SEEDDMS_ADMIN_USER}" "${SEEDDMS_ADMIN_PWD}" +# Add application definition +spotter-appmgr add-app seeddms "https://seeddms.{host}/" "${SEEDDMS_ADMIN_USER}" "${SEEDDMS_ADMIN_PWD}" diff --git a/seeddms/Dockerfile b/seeddms/Dockerfile index 50bfa02..8bba406 100644 --- a/seeddms/Dockerfile +++ b/seeddms/Dockerfile @@ -42,6 +42,6 @@ RUN \ # TODO: id3 ? VOLUME ["/srv/seeddms/www/config", "/srv/seeddms/data"] -EXPOSE 8010 +EXPOSE 8080 CMD ["s6-svscan", "/etc/services.d"] diff --git a/seeddms/docker/etc/nginx/nginx.conf b/seeddms/docker/etc/nginx/nginx.conf index bee4c33..683ee1a 100644 --- a/seeddms/docker/etc/nginx/nginx.conf +++ b/seeddms/docker/etc/nginx/nginx.conf @@ -17,7 +17,7 @@ http { sendfile on; server { - listen 8010; + listen 8080; server_name localhost; root /srv/seeddms/www; diff --git a/seeddms/etc/init.d/seeddms b/seeddms/etc/init.d/seeddms index a060acf..fe03e72 100755 --- a/seeddms/etc/init.d/seeddms +++ b/seeddms/etc/init.d/seeddms @@ -13,12 +13,15 @@ start() { -h seeddms \ --link postfix \ --link postgres \ - -p 127.0.0.1:8010:8010 \ -v /srv/seeddms/data:/srv/seeddms/data \ -v /srv/seeddms/conf:/srv/seeddms/www/conf \ seeddms } +start_post() { + /usr/local/bin/spotter-appmgr update-hosts seeddms +} + stop() { /usr/bin/docker stop seeddms } diff --git a/seeddms/etc/nginx/conf.d/seeddms.conf b/seeddms/etc/nginx/conf.d/seeddms.conf deleted file mode 100644 index 4396b24..0000000 --- a/seeddms/etc/nginx/conf.d/seeddms.conf +++ /dev/null @@ -1,14 +0,0 @@ -server { - listen [::]:8810 ipv6only=off; - listen [::]:8410 ssl http2 ipv6only=off; - - access_log /var/log/nginx/seeddms.access.log; - error_log /var/log/nginx/seeddms.error.log; - - location / { - proxy_set_header X-Forwarded-HTTPS $https; - proxy_set_header X-Forwarded-Server-Name $host; - proxy_set_header X-Forwarded-Server-Port $server_port; - proxy_pass http://127.0.0.1:8010; - } -}