Merge pull request #2 from etecs-ru/sync-with-latest

Sync with latest
etecs-ru · Dec 5, 2021 · 9af87d5 · 9af87d5
2 parents 59d89a7 + 7505b0b
commit 9af87d5
Show file tree

Hide file tree

Showing 60 changed files with 901 additions and 4,162 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -13,13 +13,11 @@ suite. This is accomplished by `make test`. Additionally, if you are adding
 new functionality, consider adding tests covering your feature.
 
 ## CI
-Each push to a branch connected to a PR will be run through GLAuth's 
-CI system. Please use these to your advantage. In particular, the Travis 
-integration tests rely on the LDAP queries returning with a set result, 
-so if your changes will change the output, Travis will likely fail.
+Each push to a branch connected to a PR will be run through GLAuth's CI system. Please use these to your advantage. In
+particular, the Github Actions integration tests rely on the LDAP queries returning with a set result, so if your
+changes will change the output, CI will likely fail.
 
-To update, run `make fast && make updatetest && make test`. This will 
-delete the output snapshots provided and make new ones. You can then 
-inspect the changes and commit them.
+To update, run `make fast && make updatetest && make test`. This will delete the output snapshots provided and make new
+ones. You can then inspect the changes and commit them.
 
 Similarly, check codeclimate and try to fix what you find there if it fails.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
diff --git a/.gitignore b/.gitignore
@@ -10,11 +10,9 @@ certs/
 # Built binaries
 bin
 
-pkg/assets/bindata.go
-
 .*.swp
 
-# Ignoring travis CLI tool logs
-*travis.log
+certs/
 
-certs/
+# Local files
+local/
diff --git a/.travis.yml b/.travis.yml
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/Dockerfile b/Dockerfile
diff --git a/Makefile b/Makefile