Unify GNU Health naming and nginx configuration for spotter-appmgr

gnuhealth.sh

@@ -33,10 +33,6 @@ cp ${SOURCE_DIR}/etc/init.d/gnuhealth /etc/init.d/gnuhealth
 rc-update add gnuhealth
 service gnuhealth start
 
-# Create nginx app definition
+# Add application definition
-cp ${SOURCE_DIR}/etc/nginx/conf.d/gnuhealth.conf /etc/nginx/conf.d/gnuhealth.conf
+spotter-appmgr add-app gnuhealth "https://gnuhealth.{host}/index.html" admin "${GNUHEALTH_ADMIN_PWD}"
-service nginx reload
+spotter-appmgr add-app gnuhealth-clients -p clienturl "gnuhealth.{host}"
-
-# Add portal application definition
-portal-app-manager gnuhealth "https://{host}:8408/index.html" admin "${GNUHEALTH_ADMIN_PWD}"
-portal-app-manager gnuhealth-clients -p clienturl "{host}:8808"

gnuhealth/Dockerfile

@@ -52,7 +52,7 @@ RUN \
  && rm -rf /usr/local/share/.cache
 
 VOLUME ["/srv/gnuhealth/gnuhealth/tryton/server/config"]
-EXPOSE 8008
+EXPOSE 8080
 
 USER gnuhealth
 ENV PATH=/srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.10/bin:${PATH} \

gnuhealth/etc/init.d/gnuhealth

@@ -13,11 +13,14 @@ start() {
 	-h gnuhealth \
 	--link postfix \
 	--link postgres \
-	-p 127.0.0.1:8008:8008 \
 	-v /srv/gnuhealth/conf:/srv/gnuhealth/gnuhealth/tryton/server/config \
 	gnuhealth
 }
 
+start_post() {
+	/usr/local/bin/spotter-appmgr update-hosts gnuhealth
+}
+
 stop() {
 	/usr/bin/docker stop gnuhealth
 }

gnuhealth/etc/nginx/conf.d/gnuhealth.conf

@@ -1,11 +0,0 @@
-server {
-    listen [::]:8808 ipv6only=off;
-    listen [::]:8408 ssl http2 ipv6only=off;
-
-    access_log /var/log/nginx/gnuhealth.access.log;
-    error_log /var/log/nginx/gnuhealth.error.log;
-
-    location / {
-        proxy_pass http://127.0.0.1:8008;
-    }
-}

gnuhealth/srv/gnuhealth/conf/trytond.conf

@@ -3,7 +3,7 @@ uri = postgresql://gnuhealth:${GNUHEALTH_PWD}@postgres
 path = /srv/gnuhealth/attach
 
 [web]
-listen = 0.0.0.0:8008
+listen = 0.0.0.0:8080
 root = /srv/gnuhealth/sao
 
 [webdav]