Skip to content

Commit a2877c7

Browse files
neurosnapneurosnap
committed
chore: TUI only accessible via pico.sh
BREAKING CHANGE: TUI only accessible via pico.sh
1 parent c71945d commit a2877c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+248
-1304
lines changed

‎.env.example

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ MINIO_PROMETHEUS_AUTH_TYPE=public
1313
MINIO_PROMETHEUS_URL=
1414
MINIO_PROMETHEUS_JOB_ID=minio
1515

16-
USE_IMGPROXY=1
1716
IMGPROXY_DOMAIN=imgproxy.dev.pico.sh
1817
IMGPROXY_URL=http://imgproxy:8080
1918
IMGPROXY_ALLOWED_SOURCES=s3://,local://
@@ -27,27 +26,6 @@ AWS_SECRET_ACCESS_KEY=$MINIO_ROOT_PASSWORD
2726
IMGPROXY_PROMETHEUS_BIND=:8081
2827
IMGPROXY_PROMETHEUS_NAMESPACE=imgproxy
2928

30-
LISTS_CADDYFILE=./caddy/Caddyfile
31-
LISTS_V4=
32-
LISTS_V6=
33-
LISTS_HTTP_V4=$LISTS_V4:80
34-
LISTS_HTTP_V6=[$LISTS_V6]:80
35-
LISTS_HTTPS_V4=$LISTS_V4:443
36-
LISTS_HTTPS_V6=[$LISTS_V6]:443
37-
LISTS_SSH_V4=$LISTS_V4:22
38-
LISTS_SSH_V6=[$LISTS_V6]:22
39-
LISTS_HOST=
40-
LISTS_SSH_PORT=2222
41-
LISTS_WEB_PORT=3000
42-
LISTS_PROM_PORT=9222
43-
LISTS_DOMAIN=lists.dev.pico.sh:3000
44-
LISTS_EMAIL=[email protected]
45-
LISTS_SUBDOMAINS=1
46-
LISTS_CUSTOMDOMAINS=1
47-
LISTS_PROTOCOL=http
48-
LISTS_ALLOW_REGISTER=1
49-
LISTS_DEBUG=1
50-
5129
PASTES_CADDYFILE=./caddy/Caddyfile
5230
PASTES_V4=
5331
PASTES_V6=
@@ -62,11 +40,7 @@ PASTES_SSH_PORT=2222
6240
PASTES_WEB_PORT=3000
6341
PASTES_PROM_PORT=9222
6442
PASTES_DOMAIN=pastes.dev.pico.sh:3001
65-
PASTES_EMAIL=[email protected]
66-
PASTES_SUBDOMAINS=1
67-
PASTES_CUSTOMDOMAINS=1
6843
PASTES_PROTOCOL=http
69-
PASTES_ALLOW_REGISTER=1
7044
PASTES_DEBUG=1
7145

7246
PROSE_CADDYFILE=./caddy/Caddyfile
@@ -83,11 +57,7 @@ PROSE_SSH_PORT=2222
8357
PROSE_WEB_PORT=3000
8458
PROSE_PROM_PORT=9222
8559
PROSE_DOMAIN=prose.dev.pico.sh:3002
86-
PROSE_EMAIL=[email protected]
87-
PROSE_SUBDOMAINS=1
88-
PROSE_CUSTOMDOMAINS=1
8960
PROSE_PROTOCOL=http
90-
PROSE_ALLOW_REGISTER=1
9161
PROSE_DEBUG=1
9262

9363
IMGS_CADDYFILE=./caddy/Caddyfile
@@ -105,10 +75,7 @@ IMGS_WEB_PORT=3000
10575
IMGS_PROM_PORT=9222
10676
IMGS_DOMAIN=imgs.dev.pico.sh:3003
10777
IMGS_EMAIL=[email protected]
108-
IMGS_SUBDOMAINS=1
109-
IMGS_CUSTOMDOMAINS=1
11078
IMGS_PROTOCOL=http
111-
IMGS_ALLOW_REGISTER=1
11279
IMGS_STORAGE_DIR=.storage
11380
IMGS_DEBUG=1
11481

@@ -127,11 +94,7 @@ FEEDS_SSH_PORT=2222
12794
FEEDS_WEB_PORT=3000
12895
FEEDS_PROM_PORT=9222
12996
FEEDS_DOMAIN=feeds.dev.pico.sh:3004
130-
FEEDS_EMAIL=[email protected]
131-
FEEDS_SUBDOMAINS=1
132-
FEEDS_CUSTOMDOMAINS=1
13397
FEEDS_PROTOCOL=http
134-
FEEDS_ALLOW_REGISTER=1
13598
FEEDS_DEBUG=1
13699

137100
PGS_CADDYFILE=./caddy/Caddyfile
@@ -148,11 +111,7 @@ PGS_SSH_PORT=2222
148111
PGS_WEB_PORT=3000
149112
PGS_PROM_PORT=9222
150113
PGS_DOMAIN=pgs.dev.pico.sh:3005
151-
PGS_EMAIL=[email protected]
152-
PGS_SUBDOMAINS=1
153-
PGS_CUSTOMDOMAINS=1
154114
PGS_PROTOCOL=http
155-
PGS_ALLOW_REGISTER=1
156115
PGS_STORAGE_DIR=.storage
157116
PGS_DEBUG=1
158117

‎cmd/scripts/clean-object-store/clean.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"github.com/picosh/pico/pgs"
1111
"github.com/picosh/pico/shared"
1212
"github.com/picosh/pico/shared/storage"
13-
"github.com/picosh/pico/wish/cms/config"
1413
)
1514

1615
func bail(err error) {
@@ -35,7 +34,7 @@ func main() {
3534
}
3635
logger := slog.Default()
3736

38-
picoCfg := config.NewConfigCms()
37+
picoCfg := shared.NewConfigSite()
3938
picoCfg.Logger = logger
4039
picoCfg.DbURL = os.Getenv("DATABASE_URL")
4140
picoCfg.MinioURL = os.Getenv("MINIO_URL")

‎cmd/scripts/dates/dates.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"github.com/picosh/pico/db"
1111
"github.com/picosh/pico/db/postgres"
1212
"github.com/picosh/pico/shared"
13-
"github.com/picosh/pico/wish/cms/config"
1413
)
1514

1615
func findPosts(dbpool *sql.DB) ([]*db.Post, error) {
@@ -59,7 +58,7 @@ func updateDates(tx *sql.Tx, postID string, date *time.Time) error {
5958
func main() {
6059
logger := slog.Default()
6160

62-
picoCfg := config.NewConfigCms()
61+
picoCfg := shared.NewConfigSite()
6362
picoCfg.Logger = logger
6463
picoCfg.DbURL = os.Getenv("DATABASE_URL")
6564
picoDb := postgres.NewDB(picoCfg.DbURL, picoCfg.Logger)

‎cmd/scripts/file-size-sync/sync.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"os"
77

88
"github.com/picosh/pico/db/postgres"
9-
"github.com/picosh/pico/wish/cms/config"
9+
"github.com/picosh/pico/shared"
1010
)
1111

1212
func bail(err error) {
@@ -18,7 +18,7 @@ func bail(err error) {
1818
func main() {
1919
logger := slog.Default()
2020

21-
picoCfg := config.NewConfigCms()
21+
picoCfg := shared.NewConfigSite()
2222
picoCfg.Logger = logger
2323
picoCfg.DbURL = os.Getenv("DATABASE_URL")
2424
picoDb := postgres.NewDB(picoCfg.DbURL, picoCfg.Logger)

‎cmd/scripts/migrate/migrate.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/picosh/pico/db"
1111
"github.com/picosh/pico/db/postgres"
12-
"github.com/picosh/pico/wish/cms/config"
12+
"github.com/picosh/pico/shared"
1313
)
1414

1515
func findPosts(dbpool *sql.DB) ([]*db.Post, error) {
@@ -101,17 +101,17 @@ type ConflictData struct {
101101
func main() {
102102
logger := slog.Default()
103103

104-
listsCfg := config.NewConfigCms()
104+
listsCfg := shared.NewConfigSite()
105105
listsCfg.Logger = logger
106106
listsCfg.DbURL = os.Getenv("LISTS_DB_URL")
107107
listsDb := postgres.NewDB(listsCfg.DbURL, listsCfg.Logger)
108108

109-
proseCfg := config.NewConfigCms()
109+
proseCfg := shared.NewConfigSite()
110110
proseCfg.DbURL = os.Getenv("PROSE_DB_URL")
111111
proseCfg.Logger = logger
112112
proseDb := postgres.NewDB(proseCfg.DbURL, proseCfg.Logger)
113113

114-
picoCfg := config.NewConfigCms()
114+
picoCfg := shared.NewConfigSite()
115115
picoCfg.Logger = logger
116116
picoCfg.DbURL = os.Getenv("PICO_DB_URL")
117117
picoDb := postgres.NewDB(picoCfg.DbURL, picoCfg.Logger)

‎cmd/scripts/shasum/shasum.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ import (
66

77
"github.com/picosh/pico/db/postgres"
88
"github.com/picosh/pico/shared"
9-
"github.com/picosh/pico/wish/cms/config"
109
)
1110

1211
func main() {
1312
logger := slog.Default()
14-
picoCfg := config.NewConfigCms()
13+
picoCfg := shared.NewConfigSite()
1514
picoCfg.Logger = logger
1615
picoCfg.DbURL = os.Getenv("DATABASE_URL")
1716
picoDb := postgres.NewDB(picoCfg.DbURL, picoCfg.Logger)

‎cmd/scripts/tags/tags.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"github.com/picosh/pico/db"
99
"github.com/picosh/pico/db/postgres"
1010
"github.com/picosh/pico/shared"
11-
"github.com/picosh/pico/wish/cms/config"
1211
)
1312

1413
func findPosts(dbpool *sql.DB) ([]*db.Post, error) {
@@ -52,7 +51,7 @@ func findPosts(dbpool *sql.DB) ([]*db.Post, error) {
5251
func main() {
5352
logger := slog.Default()
5453

55-
picoCfg := config.NewConfigCms()
54+
picoCfg := shared.NewConfigSite()
5655
picoCfg.Logger = logger
5756
picoCfg.DbURL = os.Getenv("DATABASE_URL")
5857
picoDb := postgres.NewDB(picoCfg.DbURL, picoCfg.Logger)

‎feeds/api.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ func StartApiServer() {
7777
"Starting server on port",
7878
"port", cfg.Port,
7979
"domain", cfg.Domain,
80-
"email", cfg.Email,
8180
)
8281

8382
logger.Error(http.ListenAndServe(portStr, router).Error())

‎feeds/config.go

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,34 @@ package feeds
22

33
import (
44
"github.com/picosh/pico/shared"
5-
"github.com/picosh/pico/wish/cms/config"
65
)
76

87
func NewConfigSite() *shared.ConfigSite {
98
debug := shared.GetEnv("FEEDS_DEBUG", "0")
109
domain := shared.GetEnv("FEEDS_DOMAIN", "feeds.sh")
11-
email := shared.GetEnv("FEEDS_EMAIL", "[email protected]")
12-
subdomains := shared.GetEnv("FEEDS_SUBDOMAINS", "0")
13-
customdomains := shared.GetEnv("FEEDS_CUSTOMDOMAINS", "0")
1410
port := shared.GetEnv("FEEDS_WEB_PORT", "3000")
1511
protocol := shared.GetEnv("FEEDS_PROTOCOL", "https")
16-
allowRegister := shared.GetEnv("FEEDS_ALLOW_REGISTER", "1")
1712
storageDir := shared.GetEnv("IMGS_STORAGE_DIR", ".storage")
1813
minioURL := shared.GetEnv("MINIO_URL", "")
1914
minioUser := shared.GetEnv("MINIO_ROOT_USER", "")
2015
minioPass := shared.GetEnv("MINIO_ROOT_PASSWORD", "")
2116
dbURL := shared.GetEnv("DATABASE_URL", "")
2217
sendgridKey := shared.GetEnv("SENDGRID_API_KEY", "")
23-
useImgProxy := shared.GetEnv("USE_IMGPROXY", "1")
24-
25-
intro := "To get started, enter a username.\n"
26-
intro += "To learn next steps go to our docs at https://pico.sh/feeds\n"
2718

2819
return &shared.ConfigSite{
29-
Debug: debug == "1",
30-
SubdomainsEnabled: subdomains == "1",
31-
CustomdomainsEnabled: customdomains == "1",
32-
UseImgProxy: useImgProxy == "1",
33-
SendgridKey: sendgridKey,
34-
ConfigCms: config.ConfigCms{
35-
Domain: domain,
36-
Email: email,
37-
Port: port,
38-
Protocol: protocol,
39-
DbURL: dbURL,
40-
StorageDir: storageDir,
41-
MinioURL: minioURL,
42-
MinioUser: minioUser,
43-
MinioPass: minioPass,
44-
Description: "An rss-to-email digest service for hackers",
45-
IntroText: intro,
46-
Space: "feeds",
47-
AllowedExt: []string{".txt"},
48-
HiddenPosts: []string{"_header.txt", "_readme.txt"},
49-
Logger: shared.CreateLogger(debug == "1"),
50-
AllowRegister: allowRegister == "1",
51-
},
20+
Debug: debug == "1",
21+
SendgridKey: sendgridKey,
22+
Domain: domain,
23+
Port: port,
24+
Protocol: protocol,
25+
DbURL: dbURL,
26+
StorageDir: storageDir,
27+
MinioURL: minioURL,
28+
MinioUser: minioUser,
29+
MinioPass: minioPass,
30+
Space: "feeds",
31+
AllowedExt: []string{".txt"},
32+
HiddenPosts: []string{"_header.txt", "_readme.txt"},
33+
Logger: shared.CreateLogger(debug == "1"),
5234
}
5335
}

‎feeds/cron.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ func (f *Fetcher) SendEmail(username, email string, subject string, msg *MsgBody
383383
return fmt.Errorf("(%s) does not have an email associated with their feed post", username)
384384
}
385385

386-
from := mail.NewEmail("team pico", f.cfg.Email)
386+
from := mail.NewEmail("team pico", shared.DefaultEmail)
387387
to := mail.NewEmail(username, email)
388388

389389
// f.cfg.Logger.Infof("message body (%s)", plainTextContent)

‎feeds/html/marketing.page.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{{template "base" .}}
22

3-
{{define "title"}}{{.Site.Domain}} -- an rss email notification service{{end}}
3+
{{define "title"}}{{.Site.Domain}} -- An rss email notification service{{end}}
44

55
{{define "meta"}}
6-
<meta name="description" content="an rss email notification service" />
6+
<meta name="description" content="An rss email notification service" />
77

88
<meta property="og:type" content="website">
99
<meta property="og:site_name" content="{{.Site.Domain}}">
1010
<meta property="og:url" content="https://{{.Site.Domain}}">
1111
<meta property="og:title" content="{{.Site.Domain}}">
12-
<meta property="og:description" content="an rss email notification service">
12+
<meta property="og:description" content="An rss email notification service">
1313

1414
<meta name="twitter:card" content="summary" />
1515
<meta property="twitter:url" content="https://{{.Site.Domain}}">
1616
<meta property="twitter:title" content="{{.Site.Domain}}">
17-
<meta property="twitter:description" content="an rss email notification service">
17+
<meta property="twitter:description" content="An rss email notification service">
1818
<meta name="twitter:image" content="https://{{.Site.Domain}}/card.png" />
1919
<meta name="twitter:image:src" content="https://{{.Site.Domain}}/card.png" />
2020

‎feeds/ssh.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ import (
1111
"github.com/charmbracelet/promwish"
1212
"github.com/charmbracelet/ssh"
1313
"github.com/charmbracelet/wish"
14-
bm "github.com/charmbracelet/wish/bubbletea"
1514
"github.com/picosh/pico/db/postgres"
1615
"github.com/picosh/pico/filehandlers"
1716
"github.com/picosh/pico/shared"
1817
"github.com/picosh/pico/shared/storage"
1918
wsh "github.com/picosh/pico/wish"
20-
"github.com/picosh/pico/wish/cms"
2119
"github.com/picosh/send/list"
2220
"github.com/picosh/send/pipe"
2321
"github.com/picosh/send/proxy"
@@ -41,7 +39,7 @@ func createRouter(handler *filehandlers.FileHandlerRouter) proxy.Router {
4139
scp.Middleware(handler),
4240
wishrsync.Middleware(handler),
4341
auth.Middleware(handler),
44-
wsh.PtyMdw(bm.Middleware(cms.Middleware(&handler.Cfg.ConfigCms, handler.Cfg))),
42+
wsh.PtyMdw(wsh.DeprecatedNotice()),
4543
wsh.LogMiddleware(handler.GetLogger()),
4644
}
4745
}

‎imgs/api.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ func StartApiServer() {
335335
"Starting server on port",
336336
"port", cfg.Port,
337337
"domain", cfg.Domain,
338-
"email", cfg.Email,
339338
)
340339

341340
logger.Error(http.ListenAndServe(portStr, router).Error())

0 commit comments

Comments
 (0)