Merge pull request #1442 from laws-africa/senlii

remove senlii; add open by-laws microsites; checkout v3

.github/workflows/deploy.yml

@@ -12,7 +12,7 @@ jobs:
     name: Deploy to africanlii.org
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
@@ -27,7 +27,7 @@ jobs:
     name: Deploy to lawlibrary
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
@@ -38,30 +38,13 @@ jobs:
         git_remote_url: 'ssh://[email protected]:22/lawlibrary-peachjam'
         git_push_flags: '--force'
 
-  deploy-senlii:
-    if: ${{ always() }}
-    needs: deploy-eswatinilii
-    name: Deploy to senlii
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: git push to senlii.org
-        uses: dokku/github-action@master
-        with:
-          ssh_private_key: ${{ secrets.SSH_DEPLOYMENT_KEY }}
-          git_remote_url: 'ssh://[email protected]:22/senlii-peachjam'
-          git_push_flags: '--force'
-
   deploy-ulii:
     if: ${{ always() }}
     needs: deploy-agp
     name: Deploy to ulii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -78,7 +61,7 @@ jobs:
     name: Deploy to zanzibarlii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -93,7 +76,7 @@ jobs:
     name: Deploy to malawilii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -110,7 +93,7 @@ jobs:
     name: Deploy to ghalii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -127,7 +110,7 @@ jobs:
     name: Deploy to zambialii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -146,7 +129,7 @@ jobs:
     name: Deploy to namiblii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -164,7 +147,7 @@ jobs:
     name: Deploy to seylii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -182,7 +165,7 @@ jobs:
     name: Deploy to lesotholii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -200,7 +183,7 @@ jobs:
     name: Deploy to sierralii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -219,7 +202,7 @@ jobs:
     name: Deploy to zimlii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -237,7 +220,7 @@ jobs:
     name: Deploy to tcilii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -254,7 +237,7 @@ jobs:
     name: Deploy to tanzlii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -271,7 +254,7 @@ jobs:
     name: Deploy to eswatinilii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -288,7 +271,7 @@ jobs:
     name: Deploy to nigerialii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -305,7 +288,7 @@ jobs:
     name: Deploy to open-by-laws
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -316,13 +299,30 @@ jobs:
           git_remote_url: 'ssh://[email protected]:22/open-by-laws'
           git_push_flags: '--force'
 
+  deploy-obl-microsites:
+    if: ${{ always() }}
+    needs: deploy-open-by-laws
+    name: Deploy to open by-laws microsites
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: git push to openbylaws.org.za
+        uses: dokku/github-action@master
+        with:
+          ssh_private_key: ${{ secrets.SSH_DEPLOYMENT_KEY }}
+          git_remote_url: 'ssh://[email protected]:22/obl-microsites'
+          git_push_flags: '--force'
+
   deploy-lii:
     if: ${{ always() }}
-    needs: deploy-senlii
+    needs: deploy-eswatinilii
     name: Deploy to lii
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 

africanlii/settings.py

@@ -15,7 +15,6 @@
     "lesotholii",
     "malawilii",
     "namiblii",
-    "senlii",
     "seylii",
     "sierralii",
     "tanzlii",

peachjam/views/documents.py

@@ -50,10 +50,6 @@ class RedirectResolver:
             "place_code": [],
             "domain": "openbylaws.org.za",
         },
-        "senlii": {
-            "country_code": "sn",
-            "domain": "senlii.org",
-        },
         "seylii": {
             "country_code": "sc",
             "domain": "seylii.org",