diff options
Diffstat (limited to 'internal/layout')
| -rw-r--r-- | internal/layout/layout.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/internal/layout/layout.go b/internal/layout/layout.go index d5888dc..5c2cf30 100644 --- a/internal/layout/layout.go +++ b/internal/layout/layout.go @@ -22,6 +22,7 @@ type Config struct { JailsMount string // parent mountpoint for per-app datasets JailConfDir string // /etc/jail.conf.d NginxConfDir string // nginx include dir regenerated on every deploy + LocksDir string // per-app flock files live here, outside any per-app dataset } func Default() Config { @@ -32,6 +33,7 @@ func Default() Config { JailsMount: "/skiff/apps", JailConfDir: "/etc/jail.conf.d", NginxConfDir: "/usr/local/etc/nginx/skiff.d", + LocksDir: "/skiff/locks", } } @@ -47,6 +49,15 @@ func (c Config) RepoPath(app string) string { return filepath.Join(c.ReposDir, app+".git") } +// LockPath is the per-app flock file that serializes deploy, config change, +// and rollback against each other. It deliberately lives outside +// AppDataset(app): that dataset gets `zfs rollback`ed on a failed health +// check or a manual rollback, which would discard a lock file living inside +// it along with everything else written since the snapshot. +func (c Config) LockPath(app string) string { + return filepath.Join(c.LocksDir, app+".lock") +} + func (c Config) JailConfPath(app string) string { return filepath.Join(c.JailConfDir, app+".conf") } |