diff --git a/kanboard.sh b/kanboard.sh index e4218e6..18437fb 100755 --- a/kanboard.sh +++ b/kanboard.sh @@ -28,13 +28,9 @@ cp ${SOURCE_DIR}/etc/init.d/kanboard /etc/init.d/kanboard rc-update add kanboard service kanboard start -# Create nginx app definition -cp ${SOURCE_DIR}/etc/nginx/conf.d/kanboard.conf /etc/nginx/conf.d/kanboard.conf -service nginx reload - # Install cron job cp ${SOURCE_DIR}/etc/periodic/daily/kanboard /etc/periodic/daily/kanboard -# Add portal application definition -portal-app-manager kanboard "https://{host}:8409/" "${KANBOARD_ADMIN_USER}" "${KANBOARD_ADMIN_PWD}" -portal-app-manager kanboard-mobile -p clienturl "http://{host}:8809/" +# Add application definition +spotter-appmgr add-app kanboard "https://kanboard.{host}/" "${KANBOARD_ADMIN_USER}" "${KANBOARD_ADMIN_PWD}" +spotter-appmgr add-app kanboard-mobile -p clienturl "https://kanboard.{host}" diff --git a/kanboard/Dockerfile b/kanboard/Dockerfile index b009a6a..1d034b2 100644 --- a/kanboard/Dockerfile +++ b/kanboard/Dockerfile @@ -42,6 +42,6 @@ RUN \ COPY docker/ / VOLUME ["/srv/kanboard/data/files"] -EXPOSE 8009 +EXPOSE 8080 CMD ["s6-svscan", "/etc/services.d"] diff --git a/kanboard/docker/etc/nginx/nginx.conf b/kanboard/docker/etc/nginx/nginx.conf index 668ace7..5e4961e 100644 --- a/kanboard/docker/etc/nginx/nginx.conf +++ b/kanboard/docker/etc/nginx/nginx.conf @@ -17,7 +17,7 @@ http { sendfile on; server { - listen 8009; + listen 8080; server_name localhost; root /srv/kanboard; diff --git a/kanboard/etc/init.d/kanboard b/kanboard/etc/init.d/kanboard index b8565aa..b17d5a6 100755 --- a/kanboard/etc/init.d/kanboard +++ b/kanboard/etc/init.d/kanboard @@ -13,12 +13,15 @@ start() { -h kanboard \ --link postfix \ --link postgres \ - -p 127.0.0.1:8009:8009 \ -v /srv/kanboard/data:/srv/kanboard/data/files \ -v /srv/kanboard/conf/config.php:/srv/kanboard/config.php \ kanboard } +start_post() { + /usr/local/bin/spotter-appmgr update-hosts kanboard +} + stop() { /usr/bin/docker stop kanboard } diff --git a/kanboard/etc/nginx/conf.d/kanboard.conf b/kanboard/etc/nginx/conf.d/kanboard.conf deleted file mode 100644 index 01526fb..0000000 --- a/kanboard/etc/nginx/conf.d/kanboard.conf +++ /dev/null @@ -1,14 +0,0 @@ -server { - listen [::]:8809 ipv6only=off; - listen [::]:8409 ssl http2 ipv6only=off; - - access_log /var/log/nginx/kanboard.access.log; - error_log /var/log/nginx/kanboard.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:8009; - } -}