move to apisite/enfist

Author: LeKovr

apps/cis/html/index.html

@@ -43,7 +43,7 @@ <h5>Our resources</h5>
           </div>
           <ul>
             <li><a href="/logs/" target="_blank">Application logs</a>
-            <li><a href="/conf/rpc/tag" target="_blank">Config store</a>
+            <li><a href="/conf/" target="_blank">Config store</a>
             <li><a href="/dashboard/" target="_blank">Traefik dashboard</a>
             <li><a href="/hook.pub">Hook public key</a> (for use in Gitea remove last CR)</li>
           </ul>

apps/cis/nginx.conf

@@ -72,11 +72,12 @@ server {
   }
 
   # enfist
-  location /conf/rpc/ {
+  location /conf/ {
     auth_request                /auth;
     auth_request_set            $narra_user $upstream_http_x_username;
-    proxy_pass http://enfist:8080/rpc/;
-    proxy_buffering off;
+    proxy_pass                  http://enfist:8080/;
+    proxy_set_header            X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_buffering             off;
     if_modified_since           off;
     etag                        off;
     expires                     -1;

apps/enfist/Makefile

@@ -10,14 +10,10 @@ DCAPE_USED         ?= 0
 ENFIST_DB_TAG      ?= enfist
 # Database user password
 ENFIST_DB_PASS     ?= $(shell < /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo)
-# dbrpc docker image version by dcape
-ENFIST_DBRPC_VER0   ?= 0.31
-# dbrpc docker image version
-ENFIST_DBRPC_VER    ?= $(ENFIST_DBRPC_VER0)
-
-# Internal pgrpc-sql packages
-ENFIST_SQL_RPC_VERSION    ?= 0.4
-ENFIST_SQL_ENFIST_VERSION ?= 0.3
+# apisite/app-enfist docker image version by dcape
+ENFIST_VER0        ?= 0.3
+# apisite/app-enfist docker image version
+ENFIST_VER         ?= $(ENFIST_DBRPC_VER0)
 
 define CONFIG_ENFIST
 # ------------------------------------------------------------------------------
@@ -29,30 +25,22 @@ ENFIST_DB_TAG=$(ENFIST_DB_TAG)
 # Database user password
 ENFIST_DB_PASS=$(ENFIST_DB_PASS)
 
-# dbrpc docker image version
-ENFIST_DBRPC_VER=$(ENFIST_DBRPC_VER)
+# apisite/app-enfist docker image version
+ENFIST_VER=$(ENFIST_VER)
 
 endef
 export CONFIG_ENFIST
 
 enfist-init:
 	@grep ENFIST_ .env > /dev/null || echo "$$CONFIG_ENFIST" >> .env
-	@if [[ "$$ENFIST_DBRPC_VER0" != "$$ENFIST_DBRPC_VER" ]] ; then \
-	  echo "Warning: ENFIST_DBRPC_VER in dcape ($$ENFIST_DBRPC_VER0) differs from yours ($$ENFIST_DBRPC_VER)" ; \
+	@if [[ "$$ENFIST_VER0" != "$$ENFIST_VER" ]] ; then \
+	  echo "Warning: ENFIST_VER in dcape ($$ENFIST_VER0) differs from yours ($$ENFIST_VER)" ; \
 	fi
 
 enfist-apply:
 	@cmd=create ; \
-	$(MAKE) -s db-create NAME=ENFIST || cmd=update ; \
-	[ -d var/enfist-tmp ] || mkdir var/enfist-tmp ; \
-	pushd var/enfist-tmp > /dev/null \
-	&& curl -sL https://github.com/pgrpc/pgrpc-sql-rpc/archive/v${ENFIST_SQL_RPC_VERSION}.tar.gz | tar -xvz \
-	&& pushd pgrpc-sql-rpc-${ENFIST_SQL_RPC_VERSION} > /dev/null \
-	&& $(MAKE) -s $$cmd TOOL=docker SCHEMA=rpc PG_CONTAINER=$${PROJECT_NAME}_db_1 DB_USER=$${ENFIST_DB_TAG} \
-	&& popd > /dev/null \
-	&& curl -sL https://github.com/pgrpc/pgrpc-sql-enfist/archive/v${ENFIST_SQL_ENFIST_VERSION}.tar.gz | tar -xvz \
-	&& pushd pgrpc-sql-enfist-${ENFIST_SQL_ENFIST_VERSION} > /dev/null \
-	&& $(MAKE) -s $$cmd TOOL=docker SCHEMA=env PG_CONTAINER=$${PROJECT_NAME}_db_1 DB_USER=$${ENFIST_DB_TAG} \
-	&& popd > /dev/null \
-	&& popd > /dev/null \
-	&& rm -rf var/enfist-tmp
+	$(MAKE) -s db-create NAME=ENFIST
+	DCAPE_DB=$${PROJECT_NAME}_db_1 \
+	&& PGPASSWORD=$${ENFIST_DB_PASS} \
+	&& cat apps/enfist/migrate.sql | docker exec -i $$DCAPE_DB psql -U $$ENFIST_DB_TAG $$ENFIST_DB_TAG
+	$(MAKE) -s dc CMD="run enfist make poma-install"

apps/enfist/docker-compose.inc.yml

@@ -1,10 +1,7 @@
   # ------------------------------------------------------------------------------
   enfist:
-    image: lekovr/dbrpc:${ENFIST_DBRPC_VER}
-#    image: dbrpc
+    image: apisite/enfist:${ENFIST_VER}
     restart: always
-#    ports:
-#      - "8080:8080"
     depends_on:
       db:
         condition: service_healthy
@@ -14,6 +11,11 @@
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     command:
-      --http_addr :8080 --db_connect ${ENFIST_DB_TAG}:${ENFIST_DB_PASS}@db:5432/${ENFIST_DB_TAG}?sslmode=disable
-      --db_schema rpc,public --db_reset_event disable --auth_header "X-Authorization"
-
+      /usr/bin/apisite --db_schema rpc --http_addr :8080
+    environment:
+      - PGHOST=db
+      - PGDATABASE=${ENFIST_DB_TAG}
+      - PGUSER=${ENFIST_DB_TAG}
+      - PGPASSWORD=${ENFIST_DB_PASS}
+      - PGSSLMODE=disable
+      - GIN_MODE=release

apps/enfist/migrate.sql

@@ -0,0 +1,32 @@
+/*
+
+    Migration from pgrpc to pomasql
+
+  This code moves enfist data from env.tag to pers.enfist_tag
+  and removes all of pgrpc code, so it will do nothing on second run
+
+*/
+
+DO $_$
+BEGIN
+  IF EXISTS(SELECT 1 FROM information_schema.schemata WHERE schema_name = 'env') THEN
+
+    -- code from enfist/11_schema.sql
+    CREATE SCHEMA IF NOT EXISTS pers;
+
+    -- code from enfist/20_tag_once.sql
+    CREATE TABLE IF NOT EXISTS pers.enfist_tag(
+      code       TEXT PRIMARY KEY
+    , alias_for  TEXT REFERENCES pers.enfist_tag(code)
+    , data       TEXT
+    , updated_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP
+    );
+
+    -- migrate data
+    INSERT INTO pers.enfist_tag SELECT * FROM env.tag;
+    -- drop pgrpc code
+    DROP SCHEMA env CASCADE;
+    DROP SCHEMA rpc CASCADE;
+
+  END IF;
+END$_$;