Merge pull request #698 from jan-stanek/workflows

deploy variables fixed
skaut · Feb 16, 2020 · 2935f58 · 2935f58
2 parents d02786d + 70c31b8
commit 2935f58
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/app/config/production.local.neon b/app/config/production.local.neon
@@ -2,15 +2,15 @@ parameters:
 
 dbal:
     connection:
-        host: ${config.database.host}
+        host: "__CONFIG_DATABASE_HOST__"
         driver: mysqli
-        dbname: ${config.database.name}
-        user: ${config.database.user}
-        password: ${config.database.password}
+        dbname: "__CONFIG_DATABASE_NAME__"
+        user: "__CONFIG_DATABASE_USER__"
+        password: "__CONFIG_DATABASE_PASSWORD__"
 
 skautis:
-    applicationId: ${config.skautis.applicationId}
-    testMode: ${config.skautis.testMode}
+    applicationId: "__CONFIG_SKAUTIS_APPLICATION_ID__"
+    testMode: __CONFIG_SKAUTIS_TEST_MODE__
 
 mail:
     smtp: false
diff --git a/build.xml b/build.xml
@@ -32,15 +32,17 @@
         </copy>
 
         <property environment="env"/>
-        <property name="config.skautis.applicationId" value="${env.CONFIG_SKAUTIS_APPLICATION_ID}"/>
-        <property name="config.skautis.testMode" value="${env.CONFIG_SKAUTIS_TEST_MODE}"/>
-        <property name="config.database.host" value="${env.CONFIG_DATABASE_HOST}"/>
-        <property name="config.database.user" value="${env.CONFIG_DATABASE_USER}"/>
-        <property name="config.database.password" value="${env.CONFIG_DATABASE_PASSWORD}"/>
-        <property name="config.database.name" value="${env.CONFIG_DATABASE_NAME}"/>
 
         <copy file="./app/config/production.local.neon" tofile="${build.dir}/app/config/local.neon">
             <filterchain>
+                <replacetokens begintoken="__" endtoken="__">
+                    <token key="CONFIG_SKAUTIS_APPLICATION_ID" value="${env.CONFIG_SKAUTIS_APPLICATION_ID}"/>
+                    <token key="CONFIG_SKAUTIS_TEST_MODE" value="${env.CONFIG_SKAUTIS_TEST_MODE}"/>
+                    <token key="CONFIG_DATABASE_HOST" value="${env.CONFIG_DATABASE_HOST}"/>
+                    <token key="CONFIG_DATABASE_USER" value="${env.CONFIG_DATABASE_USER}"/>
+                    <token key="CONFIG_DATABASE_PASSWORD" value="${env.CONFIG_DATABASE_PASSWORD}"/>
+                    <token key="CONFIG_DATABASE_NAME" value="${env.CONFIG_DATABASE_NAME}"/>
+                </replacetokens>
                 <expandproperties/>
             </filterchain>
         </copy>