Crosscheck, and fix all missing parameters, defaults, etc.

[gclough]

Fixed #314

Looking around, there seems to have been some missing parameters and defaults. I've crosschecked them, and updated the ones I found. I believe this is a complete verification. There are comments in #314 explaining what I did to verify this.

It looks like a lot of changes, but they are mostly repeats across several files.

[sebalix]

@gclough do not take it badly, but you should learn how to rebase your work (i.e. your PR branch) on top of master to avoid merge commits (which pollutes the history and make it harder to read/debug over time) :)

[gclough]

@sebalix ... not a problem. I thought that merging in the master branch, and manually fixing any conflicts was the right thing to do. I'll have to do some more reading, as git is a bit new to me.

[sebalix]

@gclough A merge has a strong semantic and it should be used to merge a work into a main branch (and so we keep the information that a feature/important change has been merged at a given date), but for keeping a development branch up-to-date with the main branch, rebase is the right tool to use. I know git is not a simple tool and messing up a local repository is easy for a beginner (that's why I prefer Mercurial personally in some cases ;) ). If you want some help to make a rebase on a PR, ping me, I could help you with that.

[gclough]

@sebalix ... it's "rebased"... but I'm guessing I've cocked that up entirely. :o( How can I get in touch?

[sebalix]

@gclough what commands did you go exactly? As this PR already contains a merge commit, we have to delete it when performing the rebase. I will try that locally and tell you how to fix this PR step by step.

[gclough]

I tried this:

git checkout add_missing_conf_parameters
git rebase master
git rebase --continue
git status
git add defaults/main.yml
git rebase --continue
git commit -a
git push origin add_missing_conf_parameters

That gave me an error:

[ansible@localhost postgresql]$ git push origin add_missing_conf_parameters
Username for 'https://github.com': gclough
Password for 'https://[email protected]': 
To https://github.com/gclough/postgresql.git
 ! [rejected]        add_missing_conf_parameters -> add_missing_conf_parameters (non-fast-forward)
error: failed to push some refs to 'https://github.com/gclough/postgresql.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

So I tried

git pull upstream master
git commit -a
git push origin add_missing_conf_parameters

That still didn't work, so I tried to refresh my master branch:

git checkout master
git pull upstream master
git push origin master

Then I tried to rebase:

git checkout add_missing_conf_parameters 
git pull origin master
git rebase master
git add defaults/main.yml
git rebase --continue
git commit -a
git push origin add_missing_conf_parameters

Obviously I've screwed that up, so I'll to back to try and learn git. :-(

[sebalix]

@gclough I sent you an email, did you get it (just to know)?

[github-actions[bot]]

This pr has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!