github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: allow apps named tls

Browse Source 
The `tls` name is no longer a reserved app name, and can be used by applications. This was previously a reserved app name due to it's use as a place for global SSL certificate files; Dokku has not supported global SSL certificates for many releases, and thus there is no need to reserve the name.
This commit is contained in:
Jose Diaz-Gonzalez
2020-05-08 23:57:30 -04:00
parent 4c748f2b36
commit 46287cac0f
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/appendices/0.21.0-migration-guide.md
View File

@@ -1,5 +1,9 @@
# 0.21.0 Migration Guide # 0.21.0 Migration Guide
## Changes
The `tls` name is no longer a reserved app name, and can be used by applications. This was previously a reserved app name due to it's use as a place for global SSL certificate files; Dokku has not supported global SSL certificates for many releases, and thus there is no need to reserve the name.
## Deprecations ## Deprecations
- `git#git_deploy_branch()` is deprecated in favor of `plugn trigger git-deploy-branch`. - `git#git_deploy_branch()` is deprecated in favor of `plugn trigger git-deploy-branch`.

4
plugins/apps/subcommands.go
View File

@@ -79,10 +79,6 @@ func CommandDestroy(args []string) error {
return err return err
} }
if appName == "tls" {
return errors.New("Unable to destroy tls directory")
}
if len(args) >= 2 { if len(args) >= 2 {
force := args[1] force := args[1]
if force == "force" { if force == "force" {

2
plugins/common/common.go
View File

@@ -346,7 +346,7 @@ func DokkuApps() (apps []string, err error) {
if !DirectoryExists(appRoot) { if !DirectoryExists(appRoot) {
continue continue
} }
if f.Name() == "tls" || strings.HasPrefix(f.Name(), ".") { if strings.HasPrefix(f.Name(), ".") {
continue continue
} }
apps = append(apps, f.Name()) apps = append(apps, f.Name())

2
plugins/common/functions
View File

@@ -13,7 +13,7 @@ has_tty() {
dokku_apps() { dokku_apps() {
declare desc="prints list of all local apps" declare desc="prints list of all local apps"
local INSTALLED_APPS=$(find "$DOKKU_ROOT" -follow -maxdepth 1 -mindepth 1 -type d ! -name 'tls' ! -name '.*' -printf "%f\n" 2>/dev/null | sort) || (dokku_log_fail "You haven't deployed any applications yet") local INSTALLED_APPS=$(find "$DOKKU_ROOT" -follow -maxdepth 1 -mindepth 1 -type d ! -name '.*' -printf "%f\n" 2>/dev/null | sort) || (dokku_log_fail "You haven't deployed any applications yet")
[[ $INSTALLED_APPS ]] && echo "$INSTALLED_APPS" [[ $INSTALLED_APPS ]] && echo "$INSTALLED_APPS"
} }