1f349/orchid
1
0
Fork 0
mirror of https://github.com/1f349/orchid.git synced 2024-09-07 19:06:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename module

Browse Source
This commit is contained in:
Melon 2023-07-22 01:39:39 +01:00
parent fa3f4ad99f
commit d300424706
Signed by: melon
GPG Key ID: 6C9D970C50D26A25
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/orchid/conf.go
View File

@ -1,6 +1,6 @@
package main
import "github.com/MrMelon54/orchid/renewal"
import "github.com/1f349/orchid/renewal"
type startUpConfig struct {
Listen string `yaml:"listen"`

8
cmd/orchid/serve.go
View File

@ -5,11 +5,11 @@ import (
"database/sql"
"flag"
"fmt"
httpAcme "github.com/1f349/orchid/http-acme"
"github.com/1f349/orchid/renewal"
"github.com/1f349/orchid/servers"
"github.com/1f349/violet/utils"
"github.com/MrMelon54/mjwt"
httpAcme "github.com/MrMelon54/orchid/http-acme"
"github.com/MrMelon54/orchid/renewal"
"github.com/MrMelon54/orchid/servers"
"github.com/MrMelon54/violet/utils"
"github.com/google/subcommands"
_ "github.com/mattn/go-sqlite3"
"gopkg.in/yaml.v3"

4
cmd/orchid/setup.go
View File

@ -8,9 +8,9 @@ import (
"encoding/pem"
"flag"
"fmt"
httpAcme "github.com/1f349/orchid/http-acme"
"github.com/1f349/orchid/renewal"
"github.com/AlecAivazis/survey/v2"
httpAcme "github.com/MrMelon54/orchid/http-acme"
"github.com/MrMelon54/orchid/renewal"
"github.com/google/subcommands"
"gopkg.in/yaml.v3"
"math/rand"

6
go.mod
View File

@ -1,12 +1,12 @@
module github.com/MrMelon54/orchid
module github.com/1f349/orchid
go 1.20
require (
github.com/1f349/violet v0.0.6
github.com/AlecAivazis/survey/v2 v2.3.7
github.com/MrMelon54/certgen v0.0.1
github.com/MrMelon54/mjwt v0.1.1
github.com/MrMelon54/violet v0.0.2
github.com/go-acme/lego/v4 v4.12.3
github.com/google/subcommands v1.2.0
github.com/google/uuid v1.3.0
@ -14,6 +14,7 @@ require (
github.com/mattn/go-sqlite3 v1.14.17
github.com/miekg/dns v1.1.55
github.com/stretchr/testify v1.8.4
gopkg.in/yaml.v3 v3.0.1
)
require (
@ -37,5 +38,4 @@ require (
golang.org/x/term v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
golang.org/x/tools v0.10.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

4
go.sum
View File

@ -1,11 +1,11 @@
github.com/1f349/violet v0.0.6 h1:JrSQCT3sMPJshFYXUoZOg4kjFRdE0p1roKDOgtJezC8=
github.com/1f349/violet v0.0.6/go.mod h1:5vksv2yrh9c3sf74iavp9csb8KFWTfa7fpGqIXH2ka4=
github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
github.com/MrMelon54/certgen v0.0.1 h1:ycWdZ2RlxQ5qSuejeBVv4aXjGo5hdqqL4j4EjrXnFMk=
github.com/MrMelon54/certgen v0.0.1/go.mod h1:GHflVlSbtFLJZLpN1oWyUvDBRrR8qCWiwZLXCCnS2Gc=
github.com/MrMelon54/mjwt v0.1.1 h1:m+aTpxbhQCrOPKHN170DQMFR5r938LkviU38unob5Jw=
github.com/MrMelon54/mjwt v0.1.1/go.mod h1:oYrDBWK09Hju98xb+bRQ0wy+RuAzacxYvKYOZchR2Tk=
github.com/MrMelon54/violet v0.0.2 h1:eKyeNDncF62PFE+wi+UN2qGgzFrL+7llVo3roPb9Lkw=
github.com/MrMelon54/violet v0.0.2/go.mod h1:lkxrHUtX9llm8wKCHvH9SQHilkhII/MIIbCy9U4jEHU=
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=

2
renewal/service.go
View File

@ -10,7 +10,7 @@ import (
"encoding/pem"
"errors"
"fmt"
"github.com/MrMelon54/orchid/pebble"
"github.com/1f349/orchid/pebble"
"github.com/go-acme/lego/v4/certificate"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/challenge/dns01"

6
renewal/service_test.go
View File

@ -9,9 +9,9 @@ import (
"database/sql"
"encoding/pem"
"fmt"
"github.com/1f349/orchid/pebble"
"github.com/1f349/orchid/test"
"github.com/MrMelon54/certgen"
"github.com/MrMelon54/orchid/pebble"
"github.com/MrMelon54/orchid/test"
"github.com/go-acme/lego/v4/lego"
"github.com/google/uuid"
_ "github.com/mattn/go-sqlite3"
@ -131,8 +131,8 @@ func setupPebbleTest(t *testing.T, serverTls *certgen.CertGen) *Service {
Certificate: string(certRaw),
insecure: true,
}, certDir, keyDir)
fmt.Println(err)
assert.NoError(t, err)
service.transport = acmeProv
privKey, err := rsa.GenerateKey(rand.Reader, 2048)
assert.NoError(t, err)

4
servers/api.go
View File

@ -4,10 +4,10 @@ import (
"database/sql"
"encoding/json"
"fmt"
oUtils "github.com/1f349/orchid/utils"
vUtils "github.com/1f349/violet/utils"
"github.com/MrMelon54/mjwt"
"github.com/MrMelon54/mjwt/claims"
oUtils "github.com/MrMelon54/orchid/utils"
vUtils "github.com/MrMelon54/violet/utils"
"github.com/julienschmidt/httprouter"
"net/http"
"strconv"

2
servers/auth.go
View File

@ -2,9 +2,9 @@ package servers
import (
"database/sql"
vUtils "github.com/1f349/violet/utils"
"github.com/MrMelon54/mjwt"
"github.com/MrMelon54/mjwt/auth"
vUtils "github.com/MrMelon54/violet/utils"
"github.com/julienschmidt/httprouter"
"log"
"net/http"

4
servers/certDomainManage.go
View File

@ -4,9 +4,9 @@ import (
"database/sql"
"encoding/json"
"fmt"
"github.com/1f349/orchid/renewal"
"github.com/1f349/orchid/utils"
"github.com/MrMelon54/mjwt"
"github.com/MrMelon54/orchid/renewal"
"github.com/MrMelon54/orchid/utils"
"github.com/julienschmidt/httprouter"
"net/http"
)

2
utils/domain-checker.go
View File

@ -1,6 +1,6 @@
package utils
import "github.com/MrMelon54/violet/utils"
import "github.com/1f349/violet/utils"
type DomainChecker []string