From 36bb4fb2e95dcf76c856e5777482bdcc90118d5c Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Mon, 6 Dec 2021 13:13:03 -0700
Subject: [PATCH] More scaffolder config cleanup

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .changeset/tiny-trains-notice.md              |  5 ++++
 .../software-templates/configuration.md       | 28 ++++++++++++++-----
 .../templates/default-app/app-config.yaml.hbs |  4 +--
 3 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/tiny-trains-notice.md

diff --git a/.changeset/tiny-trains-notice.md b/.changeset/tiny-trains-notice.md
new file mode 100644
index 0000000000..e6d260633e
--- /dev/null
+++ b/.changeset/tiny-trains-notice.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Removed the `scaffolder.github.visibility` configuration that is no longer used from the default app template.
diff --git a/docs/features/software-templates/configuration.md b/docs/features/software-templates/configuration.md
index b57bb96818..d22b82bc16 100644
--- a/docs/features/software-templates/configuration.md
+++ b/docs/features/software-templates/configuration.md
@@ -18,17 +18,31 @@ The next step is to add
 [add templates](http://backstage.io/docs/features/software-templates/adding-templates)
 to your Backstage app.
 
-### GitHub
+### Publishing defaults
 
-For GitHub, you can configure who can see the new repositories that are created
-by specifying `visibility` option. Valid options are `public`, `private` and
-`internal`. The `internal` option is for GitHub Enterprise clients, which means
-public within the enterprise.
+Software templates can define _publish_ actions, such as `publish:github`, to
+create new repositories or submit pull / merge requests to existing
+repositories. You can configure the author and commit message through the
+`scaffolder` configuration in `app-config.yaml`:
 
 ```yaml
 scaffolder:
-  github:
-    visibility: public # or 'internal' or 'private'
+  defaultAuthor:
+    name: M.C. Hammer # Defaults to `Scaffolder`
+    email: hammer@donthurtem.com # Defaults to `scaffolder@backstage.io`
+  defaultCommitMessage: "U can't touch this" # Defaults to 'Initial commit'
+```
+
+To configure who can see the new repositories created from software templates,
+add the `repoVisibility` key within a software template:
+
+```yaml
+- id: publish
+  name: Publish
+  action: publish:github
+  input:
+    repoUrl: '{{ parameters.repoUrl }}'
+    repoVisibility: public # or 'internal' or 'private'
 ```
 
 ### Disabling Docker in Docker situation (Optional)
diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs
index be144d91f7..c804b4b561 100644
--- a/packages/create-app/templates/default-app/app-config.yaml.hbs
+++ b/packages/create-app/templates/default-app/app-config.yaml.hbs
@@ -77,9 +77,7 @@ auth:
   providers: {}
 
 scaffolder:
-  github:
-    token: ${GITHUB_TOKEN}
-    visibility: public # or 'internal' or 'private'
+  # see https://backstage.io/docs/features/software-templates/configuration for software template options
 
 catalog:
   rules: