diff --git a/app/ldap/ldap.go b/app/ldap/ldap.go index b2a686c..f2f78c1 100644 --- a/app/ldap/ldap.go +++ b/app/ldap/ldap.go @@ -8,7 +8,7 @@ import ( "github.com/go-ldap/ldap/v3" - common "user-manager-api/app/common" + common "access-manager-api/app/common" ) // LDAPClient wrapper struct containing the connection, baseDN, peopleDN, and groupsDN diff --git a/app/ldap/utils.go b/app/ldap/utils.go index 910f628..9ec625e 100644 --- a/app/ldap/utils.go +++ b/app/ldap/utils.go @@ -8,7 +8,7 @@ import ( "github.com/gin-gonic/gin" "github.com/go-ldap/ldap/v3" - common "user-manager-api/app/common" + common "access-manager-api/app/common" ) func LDAPEntryToUser(entry *ldap.Entry) common.User { diff --git a/app/localdb/localdb.go b/app/localdb/localdb.go index 604841b..635cc5c 100644 --- a/app/localdb/localdb.go +++ b/app/localdb/localdb.go @@ -1,11 +1,11 @@ package localdb import ( + common "access-manager-api/app/common" "encoding/json" "fmt" "net/http" "os" - common "user-manager-api/app/common" ) type DB struct { diff --git a/app/main.go b/app/main.go index c33bfad..d22ef43 100644 --- a/app/main.go +++ b/app/main.go @@ -9,11 +9,11 @@ import ( "net/http" "strconv" + common "access-manager-api/app/common" + ldap "access-manager-api/app/ldap" + localdb "access-manager-api/app/localdb" + pve "access-manager-api/app/pve" paas "proxmoxaas-common-lib" - common "user-manager-api/app/common" - ldap "user-manager-api/app/ldap" - localdb "user-manager-api/app/localdb" - pve "user-manager-api/app/pve" "github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions/cookie" @@ -510,7 +510,7 @@ func Run(configPath *string, localDBPath *string) { } }) - log.Printf("Starting User Manager API on port %s\n", strconv.Itoa(Config.ListenPort)) + log.Printf("Starting Access Manager API on port %s\n", strconv.Itoa(Config.ListenPort)) err = router.Run("0.0.0.0:" + strconv.Itoa(Config.ListenPort)) if err != nil { diff --git a/app/operations.go b/app/operations.go index 532247e..67f5d87 100644 --- a/app/operations.go +++ b/app/operations.go @@ -1,10 +1,10 @@ package app import ( + common "access-manager-api/app/common" + "access-manager-api/app/ldap" "fmt" "net/http" - common "user-manager-api/app/common" - "user-manager-api/app/ldap" ) func NewPool(backends *UserSession, poolname string) (int, error) { diff --git a/app/pve/pve.go b/app/pve/pve.go index 22488ca..332b0c4 100644 --- a/app/pve/pve.go +++ b/app/pve/pve.go @@ -7,7 +7,7 @@ import ( "net/http" "slices" - common "user-manager-api/app/common" + common "access-manager-api/app/common" "github.com/luthermonson/go-proxmox" ) diff --git a/app/utils.go b/app/utils.go index 2a02a29..fc89840 100644 --- a/app/utils.go +++ b/app/utils.go @@ -7,8 +7,8 @@ import ( "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" - localdb "user-manager-api/app/localdb" - pve "user-manager-api/app/pve" + localdb "access-manager-api/app/localdb" + pve "access-manager-api/app/pve" ) type Realm struct { diff --git a/configs/template.config.json b/configs/template.config.json index 9142f8d..f0d5cdb 100644 --- a/configs/template.config.json +++ b/configs/template.config.json @@ -1,6 +1,6 @@ { "listenPort": 8083, - "sessionCookieName": "PAASUserManagerTicket", + "sessionCookieName": "PAASAccessManagerTicket", "sessionCookie": { "path": "/", "httpOnly": true, diff --git a/go.mod b/go.mod index 2b42d4d..135621b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module user-manager-api +module access-manager-api go 1.26.2 diff --git a/init/proxmoxaas-user-manager-api.service b/init/access-manager-api.service similarity index 53% rename from init/proxmoxaas-user-manager-api.service rename to init/access-manager-api.service index d60719a..4224cd7 100644 --- a/init/proxmoxaas-user-manager-api.service +++ b/init/access-manager-api.service @@ -1,9 +1,9 @@ [Unit] -Description=proxmoxaas-user-manager-api +Description=access-manager-api After=network.target [Service] WorkingDirectory=/ -ExecStart=//proxmoxaas-fabric +ExecStart=//access-manager-api Restart=always RestartSec=10 Type=simple diff --git a/user-manager-api.go b/user-manager-api.go index cfde46d..fc60046 100644 --- a/user-manager-api.go +++ b/user-manager-api.go @@ -1,8 +1,8 @@ package main import ( + app "access-manager-api/app" "flag" - app "user-manager-api/app" ) func main() {