V2: Initial API

.github/workflows/deploy.yml

@@ -20,10 +20,18 @@ jobs:
         # Verify hash
         echo "d276b0e594d5980de6a7917ce74c348f28d3cb8b353ca4eaae344ae8a4c40bea  mdbook.tar.gz" | sha256sum --check
 
+        # Get mdbook-mermaid
+        curl -sSL https://github.com/badboy/mdbook-mermaid/releases/download/v0.12.6/mdbook-mermaid-v0.12.6-x86_64-unknown-linux-gnu.tar.gz -o mdbook-mermaid.tar.gz
+        # Verify hash
+        echo "04f9fa41f89b7a1809ef2525efc7ad2c112df4ae1241de25efe354940441ea70  mdbook-mermaid.tar.gz" | sha256sum --check
+
         # Extract
         mkdir mdbook
         tar -xzf mdbook.tar.gz --directory mdbook
+        mkdir mdbook-mermaid
+        tar -xzf mdbook-mermaid.tar.gz --directory mdbook-mermaid
         echo `pwd`/mdbook >> $GITHUB_PATH
+        echo `pwd`/mdbook-mermaid >> $GITHUB_PATH
     - name: Install sphinx
       run: |
         # Install python dependencies
@@ -53,8 +61,13 @@ jobs:
         cd wrappers/python/docs
         make html
 
-        # Go to docs directory & build mdbook
-        cd ../../../docs
+        # Go to root
+        cd ../../..
+
+        # Install mermaid preprocessor
+        mdbook-mermaid install docs
+
+        cd docs
         mdbook build
 
         # gh pages branch settings
@@ -71,7 +84,7 @@ jobs:
         mv ../book/* .
 
         # move sphinx files
-        mkdir api/python/rtd
+        mkdir -p api/python/rtd
         mv ../../wrappers/python/docs/build/html/* api/python/rtd
 
         # Disable jekyll as otherwise it won't find our sphinx paths

.github/workflows/test.yml

@@ -29,8 +29,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup server
         run: |
-          git clone https://github.com/eduvpn/documentation
-          cd documentation
+          git clone https://codeberg.org/eduvpn/deploy
+          cd deploy
           sudo cp resources/[email protected] /etc/apt/trusted.gpg.d/[email protected]
           echo "deb https://repo.eduvpn.org/v3/deb jammy main" | sudo tee /etc/apt/sources.list.d/eduVPN_v3.list
           sudo apt-get -y update

.gitignore

@@ -2,3 +2,9 @@
 *.iml
 .idea/
 .DS_Store
+
+# locales
+/client/locales/*/out.gotext.json
+/docs/book/
+/cmd/cli/configs/
+/ci/docker/selfsigned/

Makefile

@@ -35,9 +35,9 @@ srpm:
 	rm -rf dist/*
 
 # Archive code with vendored dependencies
-	git clone . dist/libeduvpn-common-1.1.2
+	git clone . dist/libeduvpn-common-2.0.0
 	go mod vendor
-	cp -r vendor dist/libeduvpn-common-1.1.2/vendor
+	cp -r vendor dist/libeduvpn-common-2.0.0/vendor
 	tar -zcvf ~/rpmbuild/SOURCES/libeduvpn-common.tar.gz -C dist .
 
 # Cleanup

README.md

@@ -12,7 +12,10 @@ The only support language is Python at the moment. Other languages will come wit
 The documentation for this library can be found at [GitHub pages](https://eduvpn.github.io/eduvpn-common).
 
 ## Contributing
-Contributions are welcome.
+Contributions are welcome. Helping with translations can be done on weblate:
+<a href="https://hosted.weblate.org/engage/eduvpn-common/">
+<img src="https://hosted.weblate.org/widget/eduvpn-common/eduvpn-common/multi-auto.svg" alt="Translation status" />
+</a>
 
 ## License
 [MIT](./LICENSE)

ci/docker/eduvpnserver.docker

@@ -1,17 +1,17 @@
-FROM fedora:36
+FROM fedora:38
 
-# This dockerfile was adapted from https://github.com/eduvpn/documentation/blob/v3/deploy_fedora.sh
+# This dockerfile was adapted from https://codeberg.og/eduvpn/deploy/src/branch/v3/deploy_fedora.sh
 # DO NOT USE THIS IN PRODUCTION, ONLY FOR TESTING
 
 # Install git to clone the documentation repo
 RUN dnf -y install git
 
 WORKDIR /eduvpn
 
-# Clone the documentation
-RUN git clone https://github.com/eduvpn/documentation
+# Clone the deploy
+RUN git clone https://codeberg.org/eduvpn/deploy
 
-WORKDIR /eduvpn/documentation
+WORKDIR /eduvpn/deploy
 
 # Checkout v3 branch
 RUN git checkout v3

ci/docker/gotest.docker

@@ -10,10 +10,10 @@ RUN apt-get -y install openjdk-11-jre xvfb python3-selenium firefox-esr python3-
 
 # Install go from go.dev
 # Get
-RUN wget https://go.dev/dl/go1.19.4.linux-amd64.tar.gz -O go.tar.gz
+RUN wget https://go.dev/dl/go1.21.0.linux-amd64.tar.gz -O go.tar.gz
 
 # Verify hash
-RUN echo "c9c08f783325c4cf840a94333159cc937f05f75d36a8b307951d5bd959cf2ab8  go.tar.gz" | sha256sum --check
+RUN echo "d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742  go.tar.gz" | sha256sum --check
 
 # Untar
 RUN tar -C /usr/local -xzf go.tar.gz