Unify CrisisCleanup naming and nginx configuration for spotter-appmgr

crisiscleanup.sh

@@ -40,9 +40,5 @@ cp ${SOURCE_DIR}/etc/init.d/crisiscleanup /etc/init.d/crisiscleanup
 rc-update add crisiscleanup
 service crisiscleanup start
 
-# Create nginx app definition
+# Add application definition
-cp ${SOURCE_DIR}/etc/nginx/conf.d/crisiscleanup.conf /etc/nginx/conf.d/crisiscleanup.conf
+spotter-appmgr add-app crisiscleanup "https://crisiscleanup.{host}/" "${CRISISCLEANUP_ADMIN_EMAIL}" "${CRISISCLEANUP_ADMIN_PWD}"
-service nginx reload
-
-# Add portal application definition
-portal-app-manager crisis-cleanup "https://{host}:8405/" "${CRISISCLEANUP_ADMIN_EMAIL}" "${CRISISCLEANUP_ADMIN_PWD}"

crisiscleanup/Dockerfile

@@ -44,7 +44,7 @@ RUN \
  && rm -rf /root/.bundle /root/.config /root/.npm
 
 VOLUME ["/srv/crisiscleanup/config"]
-EXPOSE 8005
+EXPOSE 8080
 
 USER crisiscleanup
 WORKDIR /srv/crisiscleanup

crisiscleanup/etc/init.d/crisiscleanup

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

crisiscleanup/etc/nginx/conf.d/crisiscleanup.conf

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

crisiscleanup/srv/crisiscleanup/conf/boot.rb

@@ -9,7 +9,7 @@ module Rails
   class Server
     alias :default_options_bk :default_options
     def default_options
-      default_options_bk.merge!(Host: '0.0.0.0', Port: 8005)
+      default_options_bk.merge!(Host: '0.0.0.0', Port: 8080)
     end
   end
 end