refactor to separate services

config/clip.json

@@ -0,0 +1,6 @@
+{
+  "site_prefix": "/clip",
+  "max_database_pool_connections": 16,
+  "database_url": "sqlite:///var/sqlpage/clip.db",
+  "compress_responses": false
+}

config/code.json

@@ -0,0 +1,6 @@
+{
+  "site_prefix": "/code",
+  "max_database_pool_connections": 16,
+  "database_url": "sqlite:///var/sqlpage/code.db",
+  "compress_responses": false
+}

config/goto.json

@@ -0,0 +1,6 @@
+{
+  "site_prefix": "/goto",
+  "max_database_pool_connections": 16,
+  "database_url": "sqlite:///var/sqlpage/goto.db",
+  "compress_responses": false
+}

util-sqlpage/sqlpage/sqlpage.json → config/upload.json

@@ -1,6 +1,7 @@
 {
+  "site_prefix": "/upload",
   "max_uploaded_file_size": 5242880000,
   "max_database_pool_connections": 16,
-  "database_url": "sqlite://./util.db",
+  "database_url": "sqlite:///var/sqlpage/upload.db",
   "compress_responses": false
 }

docker-compose.yml

@@ -1,24 +1,82 @@
 ---
-x-podman:
-  in_pod: false
-
 services:
-  web:
+  clip:
+    image: docker.io/lovasoa/sqlpage:latest
+    hostname: clip
+    user: root
+    volumes:
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+      - ./site/clip:/var/www
+      - ./site/shared:/var/www/sqlpage
+      - ./config/migrations:/etc/sqlpage/migrations
+      - ./config/templates:/etc/sqlpage/templates
+      - ./config/clip.json:/etc/sqlpage/sqlpage.json
+      - ./data/clip.db:/var/sqlpage/clip.db
+    expose:
+      - 8080
+    networks:
+      - priv
+    restart: unless-stopped
+
+  goto:
+    image: docker.io/lovasoa/sqlpage:latest
+    hostname: goto
+    user: root
+    volumes:
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+      - ./site/goto:/var/www
+      - ./site/shared:/var/www/sqlpage
+      - ./config/migrations:/etc/sqlpage/migrations
+      - ./config/templates:/etc/sqlpage/templates
+      - ./config/goto.json:/etc/sqlpage/sqlpage.json
+      - ./data/goto.db:/var/sqlpage/goto.db
+    expose:
+      - 8080
+    networks:
+      - priv
+    restart: unless-stopped
+
+  upload:
+    image: docker.io/lovasoa/sqlpage:latest
+    hostname: upload
+    user: root
+    volumes:
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+      - ./site/upload:/var/www
+      - ./site/shared:/var/www/sqlpage
+      - ./config/migrations:/etc/sqlpage/migrations
+      - ./config/templates:/etc/sqlpage/templates
+      - ./config/upload.json:/etc/sqlpage/sqlpage.json
+      - ./data/upload.db:/var/sqlpage/upload.db
+    expose:
+      - 8080
+    networks:
+      - priv
+    restart: unless-stopped
+
+  code:
     image: docker.io/lovasoa/sqlpage:latest
-    hostname: util-web
-    user: "1000:1000"
-    userns_mode: "keep-id:uid=1000,gid=1000"
+    hostname: code
+    user: root
     volumes:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-      - ./util-sqlpage/:/var/www/
-      - ./util-sqlpage/sqlpage:/etc/sqlpage:ro
+      - ./site/code:/var/www
+      - ./site/shared:/var/www/sqlpage
+      - ./config/migrations:/etc/sqlpage/migrations
+      - ./config/templates:/etc/sqlpage/templates
+      - ./config/code.json:/etc/sqlpage/sqlpage.json
+      - ./data/code.db:/var/sqlpage/code.db
     expose:
       - 8080
     networks:
       - priv
     restart: unless-stopped
 
+
   proxy:
     image: util-pyapi
     hostname: util-proxy
@@ -26,7 +84,7 @@ services:
       context: .
       dockerfile: rest/Dockerfile
     volumes:
-      - ./util-sqlpage/util.db:/usr/src/app/util.db:ro
+      - ./data/upload.db:/usr/src/app/util.db:ro
     expose:
       - 6772
     networks:
@@ -38,4 +96,4 @@ networks:
     enable_ipv6: true
     ipam:
       config:
-       - subnet: fd00:0005::/64
+       - subnet: fd00:0010::/64

util-sqlpage/clip/form.sql → site/clip/form.sql

@@ -7,7 +7,7 @@ SELECT 'Open' AS title
 SELECT 'New' AS title
 , 1 AS width
 , 'gray-500' AS color
-, '/clip' AS link
+, '/clip/' AS link
 ;
 
 SELECT 'form' AS component

util-sqlpage/clip/index.sql → site/clip/index.sql

@@ -10,7 +10,7 @@ SET ":manifest" = '/static/clip/manifest.json';
 SET ":action" = COALESCE(:action, $action, '');
 SET ":inner" = (CASE :action
   WHEN 'open' THEN 'sqlpage/Open.sql'
-  ELSE 'clip/Index.sql'
+  ELSE 'Index.sql'
 END);
 SET ":spinner" = COALESCE(:content,'') <> '' AND COALESCE(:action, '') = 'Paste';
 SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/theme.sql') AS properties;

util-sqlpage/code/Index.sql → site/code/Index.sql

@@ -1,11 +1,11 @@
 SET ":inner" = CASE :has_post_params
   WHEN 1 THEN CASE COALESCE(:hash, '')
-    WHEN '' THEN 'code/save.sql'
-    ELSE 'code/form-fuel.sql'
+    WHEN '' THEN 'save.sql'
+    ELSE 'form-fuel.sql'
   END
   ELSE CASE COALESCE(:hash, '')
-    WHEN '' THEN 'code/recent.sql'
-    ELSE 'code/form-fuel.sql'
+    WHEN '' THEN 'recent.sql'
+    ELSE 'form-fuel.sql'
   END
 END;
 SELECT 'dynamic' AS component, sqlpage.run_sql(:inner) AS properties;

util-sqlpage/code/form-fuel.sql → site/code/form-fuel.sql

@@ -29,8 +29,8 @@ SET ":filter_config" = '[
 ]';
 
 SET ":inner" = CASE COALESCE(:action, '')
-  WHEN 'Update' THEN 'code/update.sql'
-  ELSE 'code/form.sql'
+  WHEN 'Update' THEN 'update.sql'
+  ELSE 'form.sql'
 END;
 SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/theme.sql') AS properties
 WHERE COALESCE(:action, '') <> 'Update';

util-sqlpage/code/form.sql → site/code/form.sql

@@ -49,7 +49,7 @@ SELECT COALESCE(c.v->>'name', j.v->>'name') AS name
   END AS checked
 , j.v->>'formaction'
 , COALESCE(c.v->>'required', j.v->>'required') AS required
-FROM (SELECT value v FROM json_each(sqlpage.read_file_as_text('code/json/filters.json'))) j
+FROM (SELECT value v FROM json_each(sqlpage.read_file_as_text('json/filters.json'))) j
 FULL JOIN (SELECT value v FROM json_each(:filter_config)) c
 ON (j.v->>'name' = c.v->>'name')
 LEFT JOIN (SELECT value j FROM json_each(:filter_options)) o

util-sqlpage/code/index.sql → site/code/index.sql

@@ -13,4 +13,4 @@ SET ":tabler_color" = 'azure';
 SET ":image" = '/static/code/qr.svg';
 SET ":favicon" = :image;
 --SET ":manifest" = '/static/upload/manifest.json';
-SELECT 'dynamic' AS component, sqlpage.run_sql('code/Index.sql') AS properties;
+SELECT 'dynamic' AS component, sqlpage.run_sql('Index.sql') AS properties;

util-sqlpage/code/recent.sql → site/code/recent.sql

@@ -24,7 +24,7 @@ SET ":validate" = 'Apply';
 SET ":action" = 'Apply';
 SET ":method" = 'get';
 SET ":autofill" = FALSE;
-SELECT 'dynamic' AS component, sqlpage.run_sql('code/form.sql') AS properties;
+SELECT 'dynamic' AS component, sqlpage.run_sql('form.sql') AS properties;
 
 SELECT 'list' AS component;
 SELECT COALESCE(type||' ','') || COALESCE(store||' ', '') || COALESCE(expiry, created) AS title

util-sqlpage/code/save.sql → site/code/save.sql

@@ -9,4 +9,4 @@ SET ":request" = json_object(
 SET ":meta" = sqlpage.fetch(:request);
 SET ":hash" = :meta->>'hash';
 SET ":preview" = :meta->>'preview';
-SELECT 'dynamic' AS component, sqlpage.run_sql('code/new.sql') AS properties;
+SELECT 'dynamic' AS component, sqlpage.run_sql('new.sql') AS properties;

util-sqlpage/goto/form.sql → site/goto/form.sql

@@ -7,7 +7,7 @@ SELECT 'Open' AS title
 SELECT 'New' AS title
 , 1 AS width
 , 'gray-500' AS color
-, '/goto' AS link
+, '/goto/' AS link
 ;
 
 SELECT 'form' AS component
@@ -31,6 +31,6 @@ SELECT 'content' AS name
 WHERE NOT :view
 ;
 
-SELECT 'dynamic' AS component, sqlpage.run_sql('goto/preview.sql') AS properties
+SELECT 'dynamic' AS component, sqlpage.run_sql('preview.sql') AS properties
 WHERE :content <> ''
 ;

util-sqlpage/goto/index.sql → site/goto/index.sql

@@ -11,9 +11,9 @@ SET ":manifest" = '/static/goto/manifest.json';
 SET ":action" = COALESCE($action, :action, '');
 SET ":inner" = (CASE :action
   WHEN 'open' THEN 'sqlpage/Open.sql'
-  ELSE 'goto/Index.sql'
+  ELSE 'Index.sql'
 END);
-SELECT 'dynamic' AS component, sqlpage.run_sql('goto/redirect.sql') AS properties
+SELECT 'dynamic' AS component, sqlpage.run_sql('redirect.sql') AS properties
 WHERE (:go = 'true' AND :hash <> '');
 
 SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/theme.sql') AS properties;

util-sqlpage/sqlpage/Link.sql → site/shared/Link.sql

@@ -16,7 +16,7 @@ SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/QR.sql') AS properties
 WHERE COALESCE (:hash, '') = '';
 
 SET ":inner" = CASE COALESCE(:hash, '')
-  WHEN '' THEN :tool||'/form.sql'
+  WHEN '' THEN 'form.sql'
   ELSE 'sqlpage/validate.sql'
 END;
 SELECT 'dynamic' AS component, sqlpage.run_sql(:inner) AS properties;

util-sqlpage/sqlpage/save.sql → site/shared/save.sql

@@ -14,4 +14,4 @@ SET ":meta" = json(sqlpage.fetch(:request));
 SET ":qr" = :meta->>'qr';
 SET ":hash" = :meta->>'hash';
 SET ":preview" = :meta->>'preview';
-SELECT 'dynamic' AS component, sqlpage.run_sql(:tool||'/save.sql') AS properties;
+SELECT 'dynamic' AS component, sqlpage.run_sql('save.sql') AS properties;

util-sqlpage/sqlpage/validate.sql → site/shared/validate.sql

@@ -35,7 +35,7 @@ WHERE COALESCE (:hash, '') <> '';
 
 SET ":inner" = CASE COALESCE(:content,'')
   WHEN '' THEN 'sqlpage/alert.sql'
-  ELSE :tool||'/form.sql'
+  ELSE 'form.sql'
 END;
 
 SET ":icon" = 'error-404';

util-sqlpage/upload/form.sql → site/upload/form.sql

@@ -8,7 +8,7 @@ SELECT 'Open' AS title
 SELECT 'New' AS title
 , 1 AS width
 , 'gray-500' AS color
-, '/upload' AS link
+, '/upload/' AS link
 ;
 SELECT 'Download' AS title
 , 2 AS width

util-sqlpage/upload/index.sql → site/upload/index.sql

@@ -10,7 +10,7 @@ SET ":manifest" = '/static/upload/manifest.json';
 SET ":action" = COALESCE($action, :action, '');
 SET ":inner" = (CASE :action
   WHEN 'open' THEN 'sqlpage/Open.sql'
-  ELSE 'upload/Index.sql'
+  ELSE 'Index.sql'
 END);
 SET ":file_name" = sqlpage.uploaded_file_name('content');
 SET ":mime_type" = sqlpage.uploaded_file_mime_type('content');
@@ -18,7 +18,7 @@ SET ":mime_type" = sqlpage.uploaded_file_mime_type('content');
 -- https://sql.ophir.dev/functions.sql?function=read_file_as_data_url#function
 SET ":content" = sqlpage.read_file_as_data_url(sqlpage.uploaded_file_path('content'));
 
-SELECT 'dynamic' AS component, sqlpage.run_sql('upload/temp.sql') AS properties
+SELECT 'dynamic' AS component, sqlpage.run_sql('temp.sql') AS properties
 WHERE :content IS NOT NULL AND $rowid IS NULL;
 
 SET ":file_name" = (SELECT name FROM upload_temp WHERE rowid = $rowid);