Merge pull request #3729 from atlanhq/dg1908

Added secure in ATLASSESSIONID Cookie.
atlanhq · Nov 13, 2024 · 57eff30 · 57eff30
2 parents a2c9133 + f227a68
commit 57eff30
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -25,7 +25,7 @@ on:
       - beta
       - development
       - master
-      - lineageondemand
+      - dg1908
 
 jobs:
   build:
@@ -64,7 +64,7 @@ jobs:
       - name: Build with Maven
         run: |
           branch_name=${{ steps.get_branch.outputs.branch }} 
-          if [[ $branch_name == 'main' || $branch_name == 'master' || $branch_name == 'lineageondemand' ]]
+          if [[ $branch_name == 'main' || $branch_name == 'master' || $branch_name == 'dg1908' ]]
           then
               echo "build without dashboard"
               chmod +x ./build.sh && ./build.sh build_without_dashboard

diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml
@@ -129,6 +129,7 @@
         <cookie-config>
             <name>ATLASSESSIONID</name>
             <http-only>true</http-only>
+            <secure>true</secure>
         </cookie-config>
     </session-config>