Skip to content

Conversation

@VibhuGupta-dev
Copy link
Contributor

@VibhuGupta-dev VibhuGupta-dev commented Nov 17, 2025

Caution

DO NOT MERGE UNTIL plone/cookieplone-templates#306 IS MERGED!


Fixes #1988

This PR adds the missing DevOps documentation to the docs/reference-guide/cookieplone-make-commands.md page.

What was added:

Introduced a new DevOps section describing how Cookieplone generates the devops folder when deployment options are selected.

Added instructions on how to view DevOps Makefile commands using make -C devops help.

Added the full, corrected list of DevOps Makefile commands (based on cookieplone-templates#305).

Documented tasks supported by these commands, including deployment, Ansible provisioning, secret management, linting, and rollback.

Added references to the generated DevOps README files:

  • devops/README.md

  • devops/README-GHA.md

  • devops/README-GITLAB.md

Improved structure and formatting for consistency with the rest of the documentation.

This update closes the gap in the documentation where DevOps commands were previously missing.


📚 Documentation preview 📚: https://plone6--1989.org.readthedocs.build/

@stevepiercy
Copy link
Contributor

@VibhuGupta-dev thanks for your contribution. However, please read and follow Contribute to documentation and Granting permission to publish. I can't merge this without your permission to publish in either of the two acceptable forms, and therefore I won't start a review until that's been resolved.

Please let me know. Thank you!

@VibhuGupta-dev
Copy link
Contributor Author

I, Vibhu Gupta, agree to have this contribution published under Creative Commons 4.0 International License (CC BY 4.0), with attribution to the Plone Foundation.
@stevepiercy

Copy link
Contributor

@stevepiercy stevepiercy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for working on this.

I found a couple of unrelated things that need to be addressed.

Otherwise my suggestions are intended for brevity, clarity, style guide, and other minor tweaks.

If you agree with numerous changes, you can use the "Add suggestion to batch" button in GitHub's UI to save time and avoid spamming with over a dozen notifications. Thank you!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert changes to this file. It has nothing to do with this PR.

Comment on lines +209 to +218
(contentIcons)=
contentIcons
A Volto configuration option (typically a boolean) that controls whether small content-type icons are shown next to items in lists, teasers, and navigation components.
When enabled, an icon representing the item's content type (for example: document, image, file) is displayed alongside the item's title.
(excludeLinksAndReferencesMenuItem)=
excludeLinksAndReferencesMenuItem
A Volto configuration key or menu setting that, when enabled, removes or hides the "Links and References" menu item from link pickers or site menus.
Use this option to prevent the Links and References entry from appearing in UI menus where it is not desired.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
(contentIcons)=
contentIcons
A Volto configuration option (typically a boolean) that controls whether small content-type icons are shown next to items in lists, teasers, and navigation components.
When enabled, an icon representing the item's content type (for example: document, image, file) is displayed alongside the item's title.
(excludeLinksAndReferencesMenuItem)=
excludeLinksAndReferencesMenuItem
A Volto configuration key or menu setting that, when enabled, removes or hides the "Links and References" menu item from link pickers or site menus.
Use this option to prevent the Links and References entry from appearing in UI menus where it is not desired.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please delete lines 14-23. They're out of sync with the content and don't actually provide anything useful.

Comment on lines +167 to +170
Cookieplone projects can optionally include a `devops` folder when deployment-related options are selected during project generation, such as:

- **Add Ansible playbooks?**
- **Add GitHub Action to Deploy this project?**
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Cookieplone projects can optionally include a `devops` folder when deployment-related options are selected during project generation, such as:
- **Add Ansible playbooks?**
- **Add GitHub Action to Deploy this project?**
Cookieplone projects include a `devops` folder when deployment-related questions are answered "Yes" during project generation.
These questions include the following.
- Add Ansible playbooks?
- Add GitHub Action to Deploy this project?

- **Add Ansible playbooks?**
- **Add GitHub Action to Deploy this project?**

When these options are enabled, Cookieplone generates a `devops/Makefile` containing deployment and CI/CD helper commands.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
When these options are enabled, Cookieplone generates a `devops/Makefile` containing deployment and CI/CD helper commands.
When any of these options are selected, Cookieplone generates a {file}`devops/Makefile` file containing deployment and CI/CD helper commands.

Comment on lines +204 to +210
These commands support tasks such as:

- provisioning via **Ansible**
- deploying through **GitHub Actions** or **GitLab CI**
- editing and viewing **encrypted secrets**
- linting DevOps configuration
- rolling back deployments
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't overemphasize things. It's distracting.

Suggested change
These commands support tasks such as:
- provisioning via **Ansible**
- deploying through **GitHub Actions** or **GitLab CI**
- editing and viewing **encrypted secrets**
- linting DevOps configuration
- rolling back deployments
These commands support devops tasks, such as:
- provisioning via Ansible
- deploying through GitHub Actions or GitLab CI
- editing and viewing encrypted secrets
- linting devops configuration
- rolling back deployments

- linting DevOps configuration
- rolling back deployments

## Additional Documentation
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sentence case headings.

Suggested change
## Additional Documentation
## Additional documentation


## Additional Documentation

The `devops` folder also includes README files generated by Cookieplone, which contain deployment instructions tailored to your setup:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
The `devops` folder also includes README files generated by Cookieplone, which contain deployment instructions tailored to your setup:
The {file}`devops` folder also includes {file}`README*.md` files generated by Cookieplone, which contain deployment instructions tailored to your setup:

Comment on lines +216 to +218
- {file}`devops/README.md`
- {file}`devops/README-GHA.md` (GitHub Actions deployment)
- {file}`devops/README-GITLAB.md` (GitLab deployment)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- {file}`devops/README.md`
- {file}`devops/README-GHA.md` (GitHub Actions deployment)
- {file}`devops/README-GITLAB.md` (GitLab deployment)
- {file}`devops/README.md`
- {file}`devops/README-GHA.md` for GitHub Actions deployment
- {file}`devops/README-GITLAB.md` for GitLab deployment

Comment on lines +220 to +221
These documents provide hands-on details such as provisioning steps, CI configuration, and environment requirements.
This reference section avoids duplicating that information and instead links to those files.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's combine this into one sentence. Also there are no links.

Suggested change
These documents provide hands-on details such as provisioning steps, CI configuration, and environment requirements.
This reference section avoids duplicating that information and instead links to those files.
These documents provide details, such as provisioning steps, CI configuration, and environment requirements, and are the authoritative source of documentation for devops.

@github-project-automation github-project-automation bot moved this from New to In Progress in Plone Documentation Nov 20, 2025
@stevepiercy
Copy link
Contributor

Also we can't merge this until plone/cookieplone-templates#306 is merged. @davisagli @ericof

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Make commands from devops folder are missing on docs page /reference-guide/cookieplone-make-commands.html

2 participants