use quotes around strings in yaml closes #96

This commit is contained in:
Milo Schwartz 2025-01-23 22:23:50 -05:00
parent 9a831e8e34
commit d1fead5050
No known key found for this signature in database
3 changed files with 38 additions and 33 deletions

View file

@ -1,27 +1,27 @@
app: app:
dashboard_url: http://localhost:3002 dashboard_url: "http://localhost:3002"
base_domain: localhost base_domain: "localhost"
log_level: info log_level: "info"
save_logs: false save_logs: false
server: server:
external_port: 3000 external_port: 3000
internal_port: 3001 internal_port: 3001
next_port: 3002 next_port: 3002
internal_hostname: pangolin internal_hostname: "pangolin"
secure_cookies: true secure_cookies: true
session_cookie_name: p_session session_cookie_name: "p_session"
resource_session_cookie_name: p_resource_session resource_session_cookie_name: "p_resource_session"
resource_access_token_param: p_token resource_access_token_param: "p_token"
traefik: traefik:
cert_resolver: letsencrypt cert_resolver: "letsencrypt"
http_entrypoint: web http_entrypoint: "web"
https_entrypoint: websecure https_entrypoint: "websecure"
gerbil: gerbil:
start_port: 51820 start_port: 51820
base_endpoint: localhost base_endpoint: "localhost"
block_size: 24 block_size: 24
site_block_size: 30 site_block_size: 30
subnet_group: 100.89.137.0/20 subnet_group: 100.89.137.0/20
@ -34,8 +34,8 @@ rate_limits:
users: users:
server_admin: server_admin:
email: admin@example.com email: "admin@example.com"
password: Password123! password: "Password123!"
flags: flags:
require_email_verification: false require_email_verification: false

View file

@ -1,18 +1,18 @@
app: app:
dashboard_url: https://{{.DashboardDomain}} dashboard_url: "https://{{.DashboardDomain}}"
base_domain: {{.BaseDomain}} base_domain: "{{.BaseDomain}}"
log_level: info log_level: "info"
save_logs: false save_logs: false
server: server:
external_port: 3000 external_port: 3000
internal_port: 3001 internal_port: 3001
next_port: 3002 next_port: 3002
internal_hostname: pangolin internal_hostname: "pangolin"
secure_cookies: true secure_cookies: true
session_cookie_name: p_session session_cookie_name: "p_session"
resource_session_cookie_name: p_resource_session resource_session_cookie_name: "p_resource_session"
resource_access_token_param: p_token resource_access_token_param: "p_token"
cors: cors:
origins: ["https://{{.DashboardDomain}}"] origins: ["https://{{.DashboardDomain}}"]
methods: ["GET", "POST", "PUT", "DELETE", "PATCH"] methods: ["GET", "POST", "PUT", "DELETE", "PATCH"]
@ -20,14 +20,14 @@ server:
credentials: false credentials: false
traefik: traefik:
cert_resolver: letsencrypt cert_resolver: "letsencrypt"
http_entrypoint: web http_entrypoint: "web"
https_entrypoint: websecure https_entrypoint: "websecure"
prefer_wildcard_cert: false prefer_wildcard_cert: false
gerbil: gerbil:
start_port: 51820 start_port: 51820
base_endpoint: {{.DashboardDomain}} base_endpoint: "{{.DashboardDomain}}"
use_subdomain: false use_subdomain: false
block_size: 24 block_size: 24
site_block_size: 30 site_block_size: 30
@ -39,16 +39,16 @@ rate_limits:
max_requests: 100 max_requests: 100
{{if .EnableEmail}} {{if .EnableEmail}}
email: email:
smtp_host: {{.EmailSMTPHost}} smtp_host: "{{.EmailSMTPHost}}"
smtp_port: {{.EmailSMTPPort}} smtp_port: "{{.EmailSMTPPort}}"
smtp_user: {{.EmailSMTPUser}} smtp_user: "{{.EmailSMTPUser}}"
smtp_pass: {{.EmailSMTPPass}} smtp_pass: "{{.EmailSMTPPass}}"
no_reply: {{.EmailNoReply}} no_reply: "{{.EmailNoReply}}"
{{end}} {{end}}
users: users:
server_admin: server_admin:
email: {{.AdminUserEmail}} email: "{{.AdminUserEmail}}"
password: {{.AdminUserPassword}} password: "{{.AdminUserPassword}}"
flags: flags:
require_email_verification: {{.EnableEmail}} require_email_verification: {{.EnableEmail}}

View file

@ -271,6 +271,11 @@ func createConfigFiles(config Config) error {
// Get the relative path by removing the "fs/" prefix // Get the relative path by removing the "fs/" prefix
relPath := strings.TrimPrefix(path, "fs/") relPath := strings.TrimPrefix(path, "fs/")
// skip .DS_Store
if strings.Contains(relPath, ".DS_Store") {
return nil
}
// Create the full output path under "config/" // Create the full output path under "config/"
outPath := filepath.Join("config", relPath) outPath := filepath.Join("config", relPath)
@ -374,7 +379,7 @@ func installDocker() error {
switch { switch {
case strings.Contains(osRelease, "ID=ubuntu"): case strings.Contains(osRelease, "ID=ubuntu"):
installCmd = exec.Command("bash", "-c", fmt.Sprintf(` installCmd = exec.Command("bash", "-c", fmt.Sprintf(`
apt-get update && apt-get update &&
apt-get install -y apt-transport-https ca-certificates curl software-properties-common && apt-get install -y apt-transport-https ca-certificates curl software-properties-common &&
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg &&
echo "deb [arch=%s signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list && echo "deb [arch=%s signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list &&
@ -383,7 +388,7 @@ func installDocker() error {
`, dockerArch)) `, dockerArch))
case strings.Contains(osRelease, "ID=debian"): case strings.Contains(osRelease, "ID=debian"):
installCmd = exec.Command("bash", "-c", fmt.Sprintf(` installCmd = exec.Command("bash", "-c", fmt.Sprintf(`
apt-get update && apt-get update &&
apt-get install -y apt-transport-https ca-certificates curl software-properties-common && apt-get install -y apt-transport-https ca-certificates curl software-properties-common &&
curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg &&
echo "deb [arch=%s signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list && echo "deb [arch=%s signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list &&