[freeradius] Order of import problem fixed

openwisp · Apr 28, 2021 · 77a25a9 · 77a25a9
1 parent ef14796
commit 77a25a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,11 +29,12 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Set default python version
-        run: sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 2
+        run:  update-alternatives --install /usr/bin/python python ${pythonLocation}/bin/python3.8 2
+
 
       - name: Install python dependencies
         run: |
-          sudo python3 -m pip install molecule[docker] yamllint ansible ansible-lint docker openwisp-utils[qa]
+          python -m pip install molecule[docker] yamllint ansible ansible-lint docker openwisp-utils[qa]
 
       - name: QA checks
         run: |

diff --git a/templates/freeradius/sql_counter.j2 b/templates/freeradius/sql_counter.j2
@@ -2,7 +2,7 @@
 
 sqlcounter dailycounter {
     sql_module_instance = sql
-    dialect = ${modules.sql.dialect}
+    dialect = "{{ freeradius_sql.dialect }}"
 
     counter_name = Daily-Session-Time
     check_name = Max-Daily-Session
@@ -13,11 +13,10 @@ sqlcounter dailycounter {
 
     $INCLUDE ${modconfdir}/sql/counter/${dialect}/${.:instance}.conf
 }
-
 # The dailybandwidthcounter is added by OpenWISP
 sqlcounter dailybandwidthcounter {
     sql_module_instance = sql
-    dialect = ${modules.sql.dialect}
+    dialect = "{{ freeradius_sql.dialect }}"
 
     counter_name = Max-Daily-Session-Traffic
     check_name = Max-Daily-Session-Traffic
@@ -29,7 +28,7 @@ sqlcounter dailybandwidthcounter {
 
 sqlcounter noresetcounter {
     sql_module_instance = sql
-    dialect = ${modules.sql.dialect}
+    dialect = "{{ freeradius_sql.dialect }}"
 
     counter_name = Max-All-Session-Time
     check_name = Max-All-Session
@@ -41,7 +40,7 @@ sqlcounter noresetcounter {
 
 sqlcounter monthlycounter {
     sql_module_instance = sql
-    dialect = ${modules.sql.dialect}
+    dialect = "{{ freeradius_sql.dialect }}"
 
     counter_name = Monthly-Session-Time
     check_name = Max-Monthly-Session
@@ -54,7 +53,7 @@ sqlcounter monthlycounter {
 
 sqlcounter expire_on_login {
     sql_module_instance = sql
-    dialect = ${modules.sql.dialect}
+    dialect = "{{ freeradius_sql.dialect }}"
 
     counter_name = Expire-After-Initial-Login
     check_name = Expire-After