Updated ohmyforms https://github.com/caprover/one-click-apps/pull/284

1 files changed, 14 insertions, 45 deletions

diff --git a/public/v4/apps/ohmyform.yml b/public/v4/apps/ohmyform.yml
index fd7acf8..066f606 100644
--- a/public/v4/apps/ohmyform.yml
+++ b/public/v4/apps/ohmyform.yml
@@ -1,48 +1,26 @@
 captainVersion: 4
 services:
-    $$cap_appname-redis:
-        image: redis:6.0
-        caproverExtra:
-            notExposeAsWebApp: 'true'
-    $$cap_appname-pg:
-        image: postgres:10-alpine
-        volumes:
-            - $$cap_appname-mongo-data:/var/lib/postgresql/data
-        environment:
-            POSTGRES_USER: root
-            POSTGRES_DB: $$cap_db_pass
-            MONGO_INITDB_ROOT_PASSWORD: ohmyform
-        caproverExtra:
-            notExposeAsWebApp: 'true'
-    $$cap_appname-mailhog:
-        image: mailhog/mailhog:v1.0.1
-        caproverExtra:
-            notExposeAsWebApp: 'true'
     $$cap_appname:
-        image: ohmyform/ui:0.9.9
-        environment:
-            ENDPOINT: https://$$cap_appname-api.$$cap_root_domain/graphql
-            SERVER_ENDPOINT: https://$$cap_appname-api.$$cap_root_domain/graphql
-            HIDE_CONTRIB: true
-            APP_NAME: $$cap_ohmyform_title
-            PORT: 5000
-        caproverExtra:
-            containerHttpPort: '5000'
-    $$cap_appname-api:
-        image: ohmyform/api:0.9.9
+        image: ohmyform/ohmyform:0.9.9
+        volumes:
+            - $$cap_appname-data:/data
         environment:
-            CREATE_ADMIN: true
+            CREATE_ADMIN: 'TRUE'
+            DATABASE_DRIVER: sqlite
+            DATABASE_URL: 'sqlite:///data/data.sqlite'
+            LOGIN_NOTE: 'Either login with admin:admin or create your own account to test OhMyForm'
             ADMIN_EMAIL: $$cap_ohmyform_email
             ADMIN_USERNAME: $$cap_ohmyform_user
             ADMIN_PASSWORD: $$cap_ohmyform_pass
-            DATABASE_DRIVER: postgres
-            DATABASE_URL: postgresql://root:$$cap_db_pass@srv-captain--$$cap_appname-pg:5432/ohmyform
             MAILER_URI: smtp://srv-captain--$$cap_appname-mailhog:1025
-            REDIS_URL: redis://$$cap_appname-redis
             SECRET_KEY: $$cap_gen_random_hex(64)
-            PORT: 5000
         caproverExtra:
-            containerHttpPort: '5000'
+            containerHttpPort: '3000'
+
+    $$cap_appname-mailhog:
+        image: mailhog/mailhog:v1.0.1
+        caproverExtra:
+            notExposeAsWebApp: 'true'
 caproverOneClickApp:
     variables:
         - id: $$cap_ohmyform_email
@@ -59,22 +37,13 @@ caproverOneClickApp:
           description: Password for the OhMyForm admin user
           defaultValue: $$cap_gen_random_hex(64)
           validRegex: /.{1,}/
-        - id: $$cap_db_pass
-          label: Database password
-          defaultValue: $$cap_gen_random_hex(64)
-          validRegex: /.{1,}/
-        - id: $$cap_ohmyform_title
-          label: Title
-          description: Title for OhMyForm
-          defaultValue: OhMyForm
-          validRegex: /.{1,}/
     instructions:
         start: |-
             An open source alternative to TypeForm and Google Forms that can create stunning mobile-ready forms, surveys and questionnaires.
             With OhMyForm you'll get all the features you need to run, administer, analyze and distribute forms for free.
             More details: https://ohmyform.com/
         end: |-
-            OhMyForm has been successfully deployed! Be sure to activate (or better yet, enforce) https access for $$cap_appname-api and $$cap_appname. You can then log in with user $$cap_ohmyform_user and password $$cap_ohmyform_pass at https://$$cap_appname.$$cap_root_domain
+            OhMyForm has been successfully deployed! Be sure to activate (or better yet, enforce) https access. You can then log in with user $$cap_ohmyform_user and password $$cap_ohmyform_pass at https://$$cap_appname.$$cap_root_domain
     displayName: OhMyForm
     isOfficial: true
     description: Create stunning embedable forms for recruiting, market research, surveys and more https://ohmyform.com/