Skip to content

Commit

Permalink
chore: new repository name, from "openvpn" to "docker-openvpn" (#129)
Browse files Browse the repository at this point in the history
* chore: new repository name, from "openvpn" to "docker-openvpn"

* fix: rename in import urls too

* Fixup

* fix: increase updatecli memory
  • Loading branch information
lemeurherve authored Dec 13, 2021
1 parent 3d97094 commit f525e67
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 30 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile_k8s
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ parallel(
},
'updatecli': {
withCredentials([string(credentialsId: 'updatecli-github-token', variable: 'UPDATECLI_GITHUB_TOKEN')]) {
updatecli(action: 'diff')
updatecli(action: 'diff', containerMemory: '1024Mi')
if (env.BRANCH_NAME == 'main') {
updatecli(action: 'apply', cronTriggerExpression: '@weekly')
updatecli(action: 'apply', cronTriggerExpression: '@weekly', containerMemory: '1024Mi')
}
}
},
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ If you think that you should have access to this network, feel free to read [How

To connect to this VPN, your VPN client must be configured with your [Jenkins account](https://accounts.jenkins.io/) and certificate authentication, requiring the following files:

* The CertificateAuthority **[`ca.crt`](https://github.com/jenkins-infra/openvpn/blob/main/cert/pki/ca.crt)**
* The CertificateAuthority **[`ca.crt`](https://github.com/jenkins-infra/docker-openvpn/blob/main/cert/pki/ca.crt)**
* Your private key **`<your-jenkins-username>.key`**

> ### your private key **must** remain **secret**!
Expand All @@ -31,8 +31,8 @@ Then this certificate must be signed by an administrator who also assigns you a

Feel free to follow the next action points:

* [Fork](https://help.github.com/articles/fork-a-repo/) this repository on your own Github account: [fork the repo](https://github.com/jenkins-infra/openvpn/fork)
* Clone your fork locally: `git clone https://github.com/<your-github-username>/openvpn && cd openvpn`
* [Fork](https://help.github.com/articles/fork-a-repo/) this repository on your own Github account: [fork the repo](https://github.com/jenkins-infra/docker-openvpn/fork)
* Clone your fork locally: `git clone https://github.com/<your-github-username>/docker-openvpn && cd docker-openvpn`
* Build EASYVPN binary by running one of the following commands depending on your operating system:
* `make init_osx`
* `make init_linux`
Expand All @@ -42,7 +42,7 @@ Feel free to follow the next action points:

> ### This key **must** remain **secret**!
* Create a new Pull Request on [jenkinsinfra/openvpn](https://github.com/jenkins-infra/openvpn), `main` branch: [How to Create a pull request](https://help.github.com/articles/creating-a-pull-request/)
* Create a new Pull Request on [jenkinsinfra/docker-openvpn](https://github.com/jenkins-infra/docker-openvpn), `main` branch: [How to Create a pull request](https://help.github.com/articles/creating-a-pull-request/)
* Open an INFRA ticket on [JIRA](https://issues.jenkins-ci.org) referencing your PR
* Grab a cup of coffee and wait patiently for an administrator to sign your certificate request
* Once an admin notifies you that everything is setup, you can [sync your fork](https://docs.github.com/en/github/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) then pull it to retrieve your certificate from `./cert/pki/issued/<your-jenkins-username>.crt`
Expand Down Expand Up @@ -238,6 +238,6 @@ Please report any issue on the Jenkins infrastructure [project](https://issues.j
* [How to contribute to OSS?](https://opensource.guide/how-to-contribute/)
* [jenkins-infra/azure](https://github.com/jenkins-infra/azure)
* [jenkins-infra/jenkins-infra](https://github.com/jenkins-infra/jenkins-infra/blob/production/dist/profile/manifests/openvpn.pp)
* [jenkins-infra/openvpn](https://github.com/jenkins-infra/openvpn)
* [jenkins-infra/docker-openvpn](https://github.com/jenkins-infra/docker-openvpn)
* [mozilla/sops](https://github.com/mozilla/sops)
* [openvpn/easy-rsa](https://github.com/OpenVPN/easy-rsa)
5 changes: 3 additions & 2 deletions utils/easyvpn/checks/main.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package checks

import (
"github.com/jenkins-infra/openvpn/utils/easyvpn/easyrsa"
"github.com/jenkins-infra/openvpn/utils/easyvpn/helpers"
"errors"
"fmt"
"path"
"sort"
"strings"

"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/easyrsa"
"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/helpers"
)

// IsAllCertsSigned validate that every requested certificate are signed
Expand Down
5 changes: 3 additions & 2 deletions utils/easyvpn/cmd/check.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package cmd

import (
"github.com/jenkins-infra/openvpn/utils/easyvpn/checks"
"github.com/spf13/cobra"
"os"

"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/checks"
"github.com/spf13/cobra"
)

func init() {
Expand Down
7 changes: 4 additions & 3 deletions utils/easyvpn/cmd/config.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package cmd

import (
"github.com/jenkins-infra/openvpn/utils/easyvpn/git"
"github.com/jenkins-infra/openvpn/utils/easyvpn/network"
"fmt"
"github.com/spf13/cobra"
"os"
"path"

"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/git"
"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/network"
"github.com/spf13/cobra"
)

var delete bool
Expand Down
7 changes: 4 additions & 3 deletions utils/easyvpn/cmd/request.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package cmd

import (
"github.com/jenkins-infra/openvpn/utils/easyvpn/easyrsa"
"github.com/jenkins-infra/openvpn/utils/easyvpn/git"
"fmt"
"github.com/spf13/cobra"
"path"

"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/easyrsa"
"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/git"
"github.com/spf13/cobra"
)

func init() {
Expand Down
11 changes: 6 additions & 5 deletions utils/easyvpn/cmd/revoke.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package cmd

import (
"github.com/jenkins-infra/openvpn/utils/easyvpn/easyrsa"
"github.com/jenkins-infra/openvpn/utils/easyvpn/git"
"github.com/jenkins-infra/openvpn/utils/easyvpn/helpers"
"github.com/jenkins-infra/openvpn/utils/easyvpn/network"
"fmt"
"github.com/spf13/cobra"
"os"
"path"

"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/easyrsa"
"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/git"
"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/helpers"
"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/network"
"github.com/spf13/cobra"
)

func init() {
Expand Down
11 changes: 6 additions & 5 deletions utils/easyvpn/cmd/sign.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package cmd

import (
"github.com/jenkins-infra/openvpn/utils/easyvpn/easyrsa"
"github.com/jenkins-infra/openvpn/utils/easyvpn/git"
"github.com/jenkins-infra/openvpn/utils/easyvpn/helpers"
"github.com/jenkins-infra/openvpn/utils/easyvpn/network"
"fmt"
"github.com/spf13/cobra"
"os"
"path"

"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/easyrsa"
"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/git"
"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/helpers"
"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/network"
"github.com/spf13/cobra"
)

var certDir string
Expand Down
2 changes: 1 addition & 1 deletion utils/easyvpn/git/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func Push() {
git(args...)

if err == nil {
fmt.Printf("You can now open your Pull Request via \n\t https://github.com/jenkins-infra/openvpn/compare/%v...%v:%v\n", defaultBranch, owner, branch)
fmt.Printf("You can now open your Pull Request via \n\t https://github.com/jenkins-infra/docker-openvpn/compare/%v...%v:%v\n", defaultBranch, owner, branch)
}
}

Expand Down
2 changes: 1 addition & 1 deletion utils/easyvpn/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/jenkins-infra/openvpn/utils/easyvpn
module github.com/jenkins-infra/docker-openvpn/utils/easyvpn

go 1.17

Expand Down
2 changes: 1 addition & 1 deletion utils/easyvpn/main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/jenkins-infra/openvpn/utils/easyvpn/cmd"
"github.com/jenkins-infra/docker-openvpn/utils/easyvpn/cmd"
)

func main() {
Expand Down

0 comments on commit f525e67

Please sign in to comment.