diff --git a/.env.dev b/.env.dev index a4b54ea..86fb4f2 100644 --- a/.env.dev +++ b/.env.dev @@ -1,6 +1,6 @@ # Server config MODE=development -HOST=:8000 +HOST=:8080 # Separate services GIT_URL=https://git.phc.dm.unipi.it @@ -9,6 +9,9 @@ CHAT_URL=https://chat.phc.dm.unipi.it # Other EMAIL=macchinisti@lists.dm.unipi.it +# Base URL +BASE_URL=https://phc.dm.unipi.it + # Lista Utenti USER_PAGES_BASE_URL=https://poisson.phc.dm.unipi.it/~ diff --git a/config/config.go b/config/config.go index d74ab95..30556a7 100644 --- a/config/config.go +++ b/config/config.go @@ -16,6 +16,8 @@ var GitUrl string var ChatUrl string var Email string +var BaseUrl string + var UserPagesBaseUrl string var AuthServiceHost string @@ -47,6 +49,9 @@ func Load() { loadEnv(&ChatUrl, "CHAT_URL", "https://chat.example.org") loadEnv(&Email, "EMAIL", "mail@example.org") + // Base URL + loadEnv(&BaseUrl, "BASE_URL", "localhost:8080") + // Poisson loadEnv(&UserPagesBaseUrl, "USER_PAGES_BASE_URL", "https://poisson.phc.dm.unipi.it/~") @@ -63,6 +68,8 @@ func Object() util.Map { "ChatUrl": ChatUrl, "Email": Email, + "BaseUrl": BaseUrl, + "UserPagesBaseUrl": UserPagesBaseUrl, "AuthServiceHost": AuthServiceHost, diff --git a/rss/feed.go b/rss/feed.go index 381c146..0570ced 100644 --- a/rss/feed.go +++ b/rss/feed.go @@ -2,6 +2,7 @@ package rss import ( "git.phc.dm.unipi.it/phc/website/articles" + "git.phc.dm.unipi.it/phc/website/config" "github.com/gorilla/feeds" ) @@ -22,7 +23,7 @@ func GenerateRssFeed(entries []*articles.Article, title string, link string, des &feeds.Item{ Id: entry.Id, Title: entry.Title, - Link: &feeds.Link{Href: entry.ArticlePath}, + Link: &feeds.Link{Href: config.BaseUrl + "/guide" + entry.Id}, Description: entry.Description, Created: entry.PublishDate, })