diff --git a/AUTHOR_GUIDE.md b/AUTHOR_GUIDE.md new file mode 100644 index 00000000..11557d12 --- /dev/null +++ b/AUTHOR_GUIDE.md @@ -0,0 +1,318 @@ +# Author and Release Guide + +## Document Structure + +### Folders + +This repository contains a couple of default folders. The language specific +folders are only a suggestion and have to be adapted or deleted accordingly. If +you add or remove language folders you also have to adjust the Azure DevOps +pipeline. [Doc Build](.build/doc-pipeline.yml) + +- [en](en) English documentation files. +- [images](images) Images and logo files. + +The following Markdown files are generic files describing the repository, +authoring, contributing etc. They are not related to the good practice nor will +they be used to build the good practice documentation. + +- [AUTHOR_GUIDE](AUTHOR_GUIDE.md) General author's guide to *Trivadis Markdown + Doc Template*. This has to be adapted to the corresponding guideline. +- [CHANGELOG](CHANGELOG.md) Change log for the *Trivadis Markdown Doc Template*. +- [LICENSE](LICENSE) License for this template. +- [VERSION](VERSION) file to store the version number. + +### Markdown Files + +#### General Information + +Each language of the *Trivadis Markdown Doc Template* includes a bunch of +*Markdown* files. These files do follow a naming pattern `NxMM-Title.md` where +`N` and `MM` stands for the following: + +- **N** Digit for the main chapter number. +- **M** Two digit for sorting the files within a main chapter. +- **Title** Just a title to name the file. Should be related to the content. + +*It is cructial* to keep the prefix, as this is used to sort the Markdown files +during the document build process. Files with no or an other prefix will be +ignored during documentation build. + +| Prefix | Chapter | +|--------|-------------------------------------------------------------| +| `0x..` | Preface, Revision History and other general doc information | +| `1x..` | Introduction, management summary, scope, etc. | +| `2x..` | Chapter 1 will be TOC number 3 | +| `Nx..` | Good practice chapter N will be TOC number N+2 | +| `9x..` | Appendix files | + +You can add as much files as you want. The prefix itself is not relevant for +for the TOC itself. Pandoc will create the TOC based on the headings within the +Markdown files. e.g. `#` will create a top level heading. + +#### Markdown Syntax + +You will find plenty of Markdown references and cheat sheets online e.g. +[/Markdown-Cheatsheet](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) + +Just be aware, that the Markdown syntax is checked by a Pipeline based on +markdownlint-cli (see +[markdownlint](https://github.com/DavidAnson/markdownlint), +[markdownlint-cli](https://github.com/igorshubovych/markdownlint-cli) +or [DavidAnson/markdownlint](https://hub.docker.com/r/06kellyjac/markdownlint-cli)). +Any violation of the +[rules](https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md) +will result in an error. You either have to fix the error or add an exception +to the rule. The exception has to be added to each file or alternatively in the +global configuration [.markdownlint.json](.markdownlint.json). + +A few examples for embedded exceptions: + +- Ignore rule MD013 / line length for tables + +```html + +``` + +- Ignore rule MD013 / line length completely in this file + +```html + +``` + +- Ignore rule MD024 / Multiple headings with the same content + +```html + +``` + +An example for a global exception: + +```JSON +{ + "default": true, + "MD003": { "style": "atx_closed" }, + "MD007": { "indent": 4 }, + "no-hard-tabs": false, + "whitespace": false +} +``` + +It is recommended to add a Markdown Lint to you favorite editor like +*Visual Studio Code* and the Markdownlint by David Anson. + +The latest release does support boxes in PDF generation. See +[1x10-General_Information](en/1x10-General_Information.md) for an example. + +```markdown +::: note +**Note** Lorem ipsum dolor ... +::: +``` + +### Document Metadata + +Pandoc document conversion can be configured / customized using metadata either +as a metadata block in the Markdown file itself or in a dedicated +[YAML](https://yaml.org/spec/1.2/spec.html) file. See also the +[pandoc documentation](https://pandoc.org/MANUAL.html). The workflow in this +repository is configured to use a dedicated metafile for each language. The file +is named `metadata.yml` and located in the corresponding directory (e.g. +[en/metadata.yml](en/metadata.yml)) + +It is strongly recommended to adjust the metadata according to the requirement +of the respective *documentation*. + +## Additional Language + +This template does have one folders per languages english [en](en). If +necessary, this directory can be copied to add another language. The language +abbreviation is used as the directory name. e.g. fr, de, en etc. In order for +the documents to be created for an additional language, the Azure DevOps +pipeline *Doc Build* must be adapted. For the new language, corresponding steps +must be available or corresponding job must be removed. The Azure DevOps +pipeline *Doc Build* is available in [doc-pipeline.yml](.build/doc-pipeline.yml). + +As an example, the step the German PDF documentation: + +```YAML + # Build PDF documentation using oehrlis/pandoc container + - script: | + DOC_LANG="de" + DOC_NAME="${BUILD_REPOSITORY_NAME}_${DOC_LANG}" + docker run --rm -v "$PWD":/workdir:z oehrlis/pandoc \ + --metadata-file=${DOC_LANG}/metadata.yml \ + --listings --pdf-engine=xelatex \ + --resource-path=images --filter pandoc-latex-environment \ + --output=${DOC_NAME}.pdf ${DOC_LANG}/?x??-*.md + displayName: 'Build PDF documentation' +``` + +As you can see you only have to adapt the language variable `DOC_LANG=de`. + +## Releases and Versions + +### Release and Version Numbering + +You find all official releases and release information on the Azure DevOps +project release page. As well documented in the [CHANGELOG](CHANGELOG.md). + +The versioning and release tags follow the +[semantic versioning](https://semver.org/). A version number is specified by +*MAJOR.MINOR.PATCH*, increase the: + +- *MAJOR* version when you make incompatible API changes, +- *MINOR* version when you add functionality in a backwards compatible manner, + AND +- *PATCH* version when you make backwards compatible bug fixes. + +Additional labels for pre-release and build metadata are available as extensions +to the MAJOR.MINOR.PATCH format. + +### Create a Release + +New releases currently have to be build via GitHub release. Each release require +a short release note. Procedure: + +- Update / Commit changes +- Update the [CHANGELOG](CHANGELOG.md) add the latest change information +- Create an new release +- Add release information based on changes e.g. + `git log --pretty=format:%s v0.1.0...HEAD` + +## Creating a new *Markdown* documentation + +This GIT repository is defined as a template and can be used in a new +repository. Just copy the corresponding files / folders in you GIT repository. + +- Add the files to your GIT repository +- Add or remove language folders +- Update the README files and links +- Add the Azure DevOps pipeline using the file + [.build/doc-pipeline.yml](.build/doc-pipeline.yml) + +## Build Documentation + +### Automatic Build Workflow + +The Azure DevOps GIT repository does have a pipeline with several jobs defined. + +| File | Workflow Name | Purpose | +|------------------------------------------------------------|---------------|------------------------------------------------------| +| [doc-pipeline.yml](./.build/doc-pipeline.yml) | Doc Build | Workflow with different jobs to build and publish the documents. | + +The workflow do trigger on any *push* and *pull-request* on the main branch. If +necessary it can also be triggered manually via Azure DevOps. + +### Manual Build + +#### Docker Container + +Creating the documents with the help of pandoc container +[oehrlis/pandoc](https://github.com/oehrlis/pandoc_template) is the most +convenient method. Apart from having Docker installed, there are no other +dependencies. The container xxx contains all the necessary components like +pandoc, TeX, fonts, templates, etc. + +- Generate a PDF document with support for awesome boxes + +```bash +docker run --rm -v "$PWD":/workdir:z oehrlis/pandoc \ +--metadata-file=en/metadata.yml \ +--listings --pdf-engine=xelatex \ +--resource-path=images --filter pandoc-latex-environment \ +--output=tvd-good-practice-template_en.pdf en/?x??-*.md +``` + +- Generate a PDF document without support boxes + +```bash +docker run --rm -v "$PWD":/workdir:z oehrlis/pandoc \ +--metadata-file=en/metadata.yml \ +--listings --pdf-engine=xelatex \ +--resource-path=images \ +--output=tvd-good-practice-template_en.pdf en/?x??-*.md +``` + +- Generate a DOCX document + +```bash +docker run --rm -v "$PWD":/workdir:z oehrlis/pandoc \ +--metadata-file=en/metadata.yml \ +--listings --resource-path=images \ +--output=tvd-good-practice-template_en.docx en/?x??-*.md +``` + +- Generate a PPTX document from Chapter 2-8. This will omit preface, + introduction and appendix. + +```bash +docker run --rm -v "$PWD":/workdir:z oehrlis/pandoc \ +--metadata-file=en/metadata.yml \ +--listings --resource-path=images \ +--output=tvd-good-practice-template_en.pptx en/[1-8]x??-*.md +``` + +#### Local pandoc Installation + +If you do have a local *pandoc* installation including LaTeX, you may also +generate the corresponding documents directly using `pandoc` via command line. +But be aware of the necessary requirements. e.g. fonts, LaTeX, templates from +[oehrlis/pandoc_template](https://github.com/oehrlis/pandoc_template) etc. + +- Generate a PDF document + +```bash +pandoc --metadata-file=en/metadata.yml \ +--template=$(pwd)/templates/trivadis.tex \ +--listings --pdf-engine=xelatex \ +--resource-path=images \ +--output=tvd-good-practice-template_en.pdf en/?x??-*.md +``` + +- Generate a PDF document with support for awesome boxes. + +```bash +pandoc --metadata-file=en/metadata.yml \ +--template=$(pwd)/templates/trivadis.tex \ +--listings --pdf-engine=xelatex \ +--resource-path=images --filter pandoc-latex-environment \ +--output=tvd-good-practice-template_en.pdf en/?x??-*.md +``` + +- Generate a DOCX document + +```bash +pandoc --metadata-file=en/metadata.yml \ +--listings --reference-doc templates/trivadis.docx \ +--resource-path=images \ +--output=tvd-good-practice-template_en.docx en/?x??-*.md +``` + +- Generate a standalone HTML document + +```bash +pandoc --metadata-file=en/metadata.yml \ +-s --toc --template=$(pwd)/templates/GitHub.html5 \ +--resource-path=images \ +--output=tvd-good-practice-template_en.html en/?x??-*.md +``` + +- Generate a EPUB document + +```bash +pandoc --metadata-file=en/metadata.yml \ +--reference-doc templates/trivadis.epub \ +--resource-path=images \ +--output=tvd-good-practice-template_en.epub en/?x??-*.md +``` + +## Further Topics + +There a couple of additional topics which are not yet implemented or documented. +This includes among other the following points. + +- Automatic Release Workflow +- Generate additional formates like Word (.docx), eBooks (.epub), Power Point + (.pptx), man pages, etc. +- Generate HTML version / Webpage diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..6c141a68 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,47 @@ +# Changelog + + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] - 2021-03-03 + +### Added + +- add markdownlint configuration file [.markdownlint.json](.markdownlint.json) + +### Changed + +- adapt pipeline with a new job for the markdownlint. +- Add information about [.markdownlint.json](.markdownlint.json) to + [AUTHOR_GUIDE](AUTHOR_GUIDE.md) + +### Fixed + +### Removed + +## [1.9.5] - 2021-03-03 + +### Added + +- add [CHANGELOG](CHANGELOG.md) +- add [CODE_OF_CONDUCT](CODE_OF_CONDUCT.md) +- add [CONTRIBUTING](CONTRIBUTING.md) + +### Changed + +- add latest OUD / WLS patch to [setup_oud_patch.sh](local/oudbase/bin/setup_oud_patch.sh) + and [setup_oud.sh](local/oudbase/bin/setup_oud.sh) +- change template [generic](local/oudbase/templates/create/generic) to *generic* integration. + +### Fixed + +- fix [oud_backup.sh](local/oudbase/bin/oud_backup.sh) and uncomment remove of + old backups + +### Removed + +[unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.2.1...HEAD +[1.9.5]: https://github.com/oehrlis/oudbase/releases/tag/v1.9.4 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..654e23c2 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,76 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at cpureport@trivadis.com. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..e664cffd --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,88 @@ +# Contribution guide + +Trivadis expressly welcomes all contributions to this repository from anyone. + +If you want to submit a pull request to fix a bug or improve an existing good +practice, please open an issue first and link to that issue when you submit your +pull request. + +If you have any questions about a possible submission, feel free to open an issue too. + +## Contributing to the *Good Practice* Guide + +All contributors are expected to adhere to our [code of conduct](CODE_OF_CONDUCT.md). + +For pull requests to be accepted, the bottom of your commit message must have +the following line using your name and e-mail address. + +```bash +Signed-off-by: Your Name +``` + +This will be automatically added to pull requests if you using the `signoff` +parameter when committing your changes: + +```bash + git commit [--signoff|-S] +``` + +## *Good Practice* ownership and responsibility + +The *Good Practice* are provided on behalf of Trivadis. Accordingly, changes and +enhancements are always reviewed by a Trivadis peer. However, the individual +*Good Practice* rules are worked out individually. Please make sure, that you +are familiar with the approval process to submit code to an existing GitHub +repository. The *Good Practice* owner will also be assigned to any issues +relating to their content. + +You must ensure that you check the [issues](https://github.com/Trivadis/good-practice-template/issues) +on at least a weekly basis, though daily is preferred. + +Contact [Stefan Oehrli](https://github.com/oehrlis) for more information. + +### Pull request process + +1. Fork this repository +1. Create a branch in your fork to implement the changes. We recommend using +the issue number as part of your branch name, e.g. `1234-fixes` +1. Ensure that any documentation is updated with the changes that are required +by your fix. +1. Ensure that any samples are updated if the base image has been changed. +1. Submit the pull request. *Do not leave the pull request blank*. Explain exactly +what your changes are meant to do and provide simple steps on how to validate +your changes. Ensure that you reference the issue you created as well. +We will assign the pull request to 1-2 people for review before it is merged. + +## Golden Rules + +We have some golden rules that all submitted *Good Practice* must adhere to. +These rules are provided by Trivadis Knowledge Management and may change at any time. + +Most of these are targeted at Trivadis employees, but apply to anyone who submits +a pull request. + +### Basic rules for *Good Practice* + +1. First check if this issue / enhancement for the *Good Practice* w already exists. See [issues](https://github.com/Trivadis/good-practice-template/issues) +2. Extend an existing *Good Practice* wherever possible rather than create new ones. +3. Follow the KISS principle. keep it simple, stupid + +### Security-related rules + +1. Do not hard-code any passwords or ssh keys. +1. No information about customers +1. No particularly sensitive personal data (age, health, etc.) +1. Whenever possible, please avoid personal data in the documentation + +### Documentation rules + +1. No host or domain names should be included in any code or examples. + If an example domain name is required, use `example.com`. +2. All documentation including `README.md` files needs to meet Markdown Lint we do in particular use [markdownlint](https://github.com/DavidAnson/markdownlinthttps://github.com/DavidAnson/markdownlint) from David Anson. + +### Guidelines and recommendations + +The following are some guidelines that will not prevent a *Good Practice* from being +merged, but are generally frowned upon if breached. + +- to be documented diff --git a/VERSION b/VERSION new file mode 100644 index 00000000..57d503d1 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +v1.9.5 diff --git a/build/build.sh b/build/build.sh index e48ca4fe..427ef95e 100755 --- a/build/build.sh +++ b/build/build.sh @@ -20,6 +20,7 @@ SCRIPT_NAME="$(basename ${BASH_SOURCE[0]})" # Basename of the script SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P)" # Absolute path of script SCRIPT_FQN="${SCRIPT_DIR}/${SCRIPT_NAME}" # Full qualified script name +PACKAG_BASE=$(dirname ${SCRIPT_DIR}) # basename of package export COPYFILE_DISABLE=true echo "SCRIPT_FQN=$SCRIPT_FQN" echo "SCRIPT_DIR=$SCRIPT_DIR" @@ -48,7 +49,7 @@ cp ${SCRIPT_DIR}/../README.md ${SCRIPT_DIR}/../local/oudbase/doc cp ${SCRIPT_DIR}/../LICENSE ${SCRIPT_DIR}/../local/oudbase/doc # update version in *.sh files -VERSION=$(grep -i "OUD Base Release" ./doc/.version |sed -E 's/.*(v[0-9]+.[0-9]+.[0-9]+).*/\1/') +VERSION=$(head -1 ${PACKAG_BASE}/VERSION |sed -E 's/.*(v[0-9]+.[0-9]+.[0-9]+).*/\1/') for i in ./bin/*; do echo "update version to ${VERSION} in file $i" diff --git a/local/oudbase/bin/oud_backup.sh b/local/oudbase/bin/oud_backup.sh index 44447f85..78bba43f 100755 --- a/local/oudbase/bin/oud_backup.sh +++ b/local/oudbase/bin/oud_backup.sh @@ -21,7 +21,7 @@ export OPENDS_JAVA_ARGS=-Dcom.sun.jndi.ldap.object.disableEndpointIdentification # - End of Customization ------------------------------------------------ # - Default Values ------------------------------------------------------ -VERSION=v1.9.4 +VERSION=v1.9.5 DOAPPEND="TRUE" # enable log file append VERBOSE="FALSE" # enable verbose mode SCRIPT_NAME=$(basename $0) @@ -273,7 +273,7 @@ for oud_inst in ${OUD_INST_LIST}; do # Automaticaly purge backup's older than KEEP weeks if [ -d ${OUD_BACKUP_DIR}/${OLD_BACKUP_SET} ]; then DoMsg "INFO : [$oud_inst] Remove old backup set ${OUD_BACKUP_DIR}/${OLD_BACKUP_SET} of week ${OLD_WEEKNO}" - #rm -rf ${OUD_BACKUP_DIR}/${OLD_BACKUP_SET} + rm -rf ${OUD_BACKUP_DIR}/${OLD_BACKUP_SET} else DoMsg "INFO : [$oud_inst] No old backup found (eg. ${OLD_BACKUP_SET} week ${OLD_WEEKNO})" fi diff --git a/local/oudbase/bin/oud_eusm.sh b/local/oudbase/bin/oud_eusm.sh index b6a7a0f6..c9e6d735 100755 --- a/local/oudbase/bin/oud_eusm.sh +++ b/local/oudbase/bin/oud_eusm.sh @@ -18,7 +18,7 @@ # ----------------------------------------------------------------------- # - Default Values ------------------------------------------------------ -VERSION=v1.9.4 +VERSION=v1.9.5 JRE_HOME=$JAVA_HOME/jre/ EUSMLIBDIR=$ORACLE_BASE/local/oudbase/lib ORACLEPKI=$ORACLE_HOME/oracle_common/modules/oracle.pki/oraclepki.jar diff --git a/local/oudbase/bin/oud_export.sh b/local/oudbase/bin/oud_export.sh index 41c4d975..2c2b81ec 100755 --- a/local/oudbase/bin/oud_export.sh +++ b/local/oudbase/bin/oud_export.sh @@ -21,7 +21,7 @@ export OPENDS_JAVA_ARGS=-Dcom.sun.jndi.ldap.object.disableEndpointIdentification # - End of Customization ------------------------------------------------ # - Default Values ------------------------------------------------------ -VERSION=v1.9.4 +VERSION=v1.9.5 DOAPPEND="TRUE" # enable log file append VERBOSE="FALSE" # enable verbose mode SCRIPT_NAME=$(basename $0) diff --git a/local/oudbase/bin/oud_functions.sh b/local/oudbase/bin/oud_functions.sh index 4b76ab7b..10414c4b 100755 --- a/local/oudbase/bin/oud_functions.sh +++ b/local/oudbase/bin/oud_functions.sh @@ -24,7 +24,7 @@ # - Environment Variables --------------------------------------------------- # define default values -VERSION=v1.9.4 +VERSION=v1.9.5 DOAPPEND=${DOAPPEND:-"TRUE"} # enable log file append VERBOSE=${VERBOSE:-"FALSE"} # enable verbose mode DEBUG=${DEBUG:-"FALSE"} # enable debug mode diff --git a/local/oudbase/bin/oud_start_stop.sh b/local/oudbase/bin/oud_start_stop.sh index e00a3f41..4c121911 100755 --- a/local/oudbase/bin/oud_start_stop.sh +++ b/local/oudbase/bin/oud_start_stop.sh @@ -21,7 +21,7 @@ export OPENDS_JAVA_ARGS=-Dcom.sun.jndi.ldap.object.disableEndpointIdentification # - End of Customization ------------------------------------------------ # - Default Values ------------------------------------------------------ -VERSION=v1.9.4 +VERSION=v1.9.5 DOAPPEND="TRUE" # enable log file append VERBOSE="FALSE" # enable verbose mode FORCE="FALSE" # enable force restart diff --git a/local/oudbase/bin/oud_start_stop_all b/local/oudbase/bin/oud_start_stop_all index a6359555..e7e706d7 100755 --- a/local/oudbase/bin/oud_start_stop_all +++ b/local/oudbase/bin/oud_start_stop_all @@ -18,7 +18,7 @@ # ----------------------------------------------------------------------- # - Default Values ------------------------------------------------------ -VERSION=v1.9.4 +VERSION=v1.9.5 SCRIPT_NAME=$(basename $0) export OUDBASE_BIN="$(cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P)" # - End of Default Values ----------------------------------------------- diff --git a/local/oudbase/bin/oud_status.sh b/local/oudbase/bin/oud_status.sh index dd68d9ce..40c98361 100755 --- a/local/oudbase/bin/oud_status.sh +++ b/local/oudbase/bin/oud_status.sh @@ -23,7 +23,7 @@ export OUD_CON_HANDLER=${OUD_CON_HANDLER:-"LDAP LDAPS"} # - End of Customization ------------------------------------------------ # - Default Values ------------------------------------------------------ -VERSION=v1.9.4 +VERSION=v1.9.5 DOAPPEND="TRUE" # enable log file append VERBOSE="FALSE" # enable verbose mode SCRIPT_NAME=$(basename $0) diff --git a/local/oudbase/bin/oudbase_install.sh b/local/oudbase/bin/oudbase_install.sh index 194c631c..609fa517 100755 --- a/local/oudbase/bin/oudbase_install.sh +++ b/local/oudbase/bin/oudbase_install.sh @@ -23,7 +23,7 @@ export LOG_BASE=${LOG_BASE-"/tmp"} # - End of Customization ------------------------------------------------ # - Default Values ------------------------------------------------------ -VERSION=v1.9.4 +VERSION=v1.9.5 DOAPPEND="TRUE" # enable log file append VERBOSE="TRUE" # enable verbose mode SCRIPT_NAME="$(basename ${BASH_SOURCE[0]})" # Basename of the script diff --git a/local/oudbase/bin/oudenv.sh b/local/oudbase/bin/oudenv.sh index 9af35786..76ce786b 100755 --- a/local/oudbase/bin/oudenv.sh +++ b/local/oudbase/bin/oudenv.sh @@ -22,7 +22,7 @@ # externally. In principle, these variables should not be changed at this # point. The customization should be done externally in .bash_profile or # in oudenv_core.conf. -VERSION=v1.9.4 +VERSION=v1.9.5 # define some binaries for later user PGREP_BIN=$(command -v pgrep) # get the binary for pgrep diff --git a/local/oudbase/bin/setup_oud.sh b/local/oudbase/bin/setup_oud.sh index a6e97239..6ca6f90e 100755 --- a/local/oudbase/bin/setup_oud.sh +++ b/local/oudbase/bin/setup_oud.sh @@ -31,7 +31,7 @@ # - End of Customization ------------------------------------------------ # - Default Values ------------------------------------------------------ -VERSION=v1.9.4 +VERSION=v1.9.5 SCRIPT_NAME=$(basename $0) SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P)" START_HEADER="START: Start of ${SCRIPT_NAME} (Version ${VERSION}) with $*" @@ -57,12 +57,12 @@ DEFAULT_OUD_TYPE=${OUD_TYPE:-"OUD12"} # define default software packages DEFAULT_FMW_BASE_PKG="fmw_12.2.1.4.0_infrastructure_Disk1_1of1.zip" DEFAULT_OUD_BASE_PKG="p30188352_122140_Generic.zip" -DEFAULT_OUD_PATCH_PKG="p31809303_122140_Generic.zip" -DEFAULT_FMW_PATCH_PKG="p31960985_122140_Generic.zip" -DEFAULT_OUD_OPATCH_PKG="p28186730_139424_Generic.zip" +DEFAULT_OUD_PATCH_PKG="p32730494_122140_Generic.zip" +DEFAULT_FMW_PATCH_PKG="p32698246_122140_Generic.zip" +DEFAULT_OUD_OPATCH_PKG="p28186730_139425_Generic.zip" DEFAULT_OUI_PATCH_PKG="" -DEFAULT_COHERENCE_PATCH_PKG="p30729380_122140_Generic.zip" -DEFAULT_OUD_ONEOFF_PKGS="p32097167_12214201001_Generic.zip" +DEFAULT_COHERENCE_PATCH_PKG="p32581859_122140_Generic.zip" +DEFAULT_OUD_ONEOFF_PKGS="" # define the software packages default is just the OUD 12.2.1.4 base package export OUD_BASE_PKG=${OUD_BASE_PKG:-"p30188352_122140_Generic.zip"} # OUD 12.2.1.4.0 diff --git a/local/oudbase/bin/setup_oud_patch.sh b/local/oudbase/bin/setup_oud_patch.sh index 4d3752d3..86c926e8 100755 --- a/local/oudbase/bin/setup_oud_patch.sh +++ b/local/oudbase/bin/setup_oud_patch.sh @@ -22,7 +22,7 @@ # see git revision history for more information on changes/updates # --------------------------------------------------------------------------- # - Environment Variables --------------------------------------------------- -VERSION=v1.9.4 +VERSION=v1.9.5 SCRIPT_NAME=$(basename $0) SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P)" START_HEADER="START: Start of ${SCRIPT_NAME} (Version ${VERSION}) with $*" @@ -43,12 +43,12 @@ TMP_DIR=$(mktemp -p ${SOFTWARE} -d) # create a temp directory # define default software packages DEFAULT_FMW_BASE_PKG="fmw_12.2.1.4.0_infrastructure_Disk1_1of1.zip" DEFAULT_OUD_BASE_PKG="p30188352_122140_Generic.zip" -DEFAULT_OUD_PATCH_PKG="p31809303_122140_Generic.zip" -DEFAULT_FMW_PATCH_PKG="p31960985_122140_Generic.zip" -DEFAULT_OUD_OPATCH_PKG="p28186730_139424_Generic.zip" +DEFAULT_OUD_PATCH_PKG="p32730494_122140_Generic.zip" +DEFAULT_FMW_PATCH_PKG="p32698246_122140_Generic.zip" +DEFAULT_OUD_OPATCH_PKG="p28186730_139425_Generic.zip" DEFAULT_OUI_PATCH_PKG="" -DEFAULT_COHERENCE_PATCH_PKG="p30729380_122140_Generic.zip" -DEFAULT_OUD_ONEOFF_PKGS="p32097167_12214201001_Generic.zip" +DEFAULT_COHERENCE_PATCH_PKG="p32581859_122140_Generic.zip" +DEFAULT_OUD_ONEOFF_PKGS="" # define the software packages export OUD_PATCH_PKG=${OUD_PATCH_PKG:-""} diff --git a/local/oudbase/doc/.oudbase.sha b/local/oudbase/doc/.oudbase.sha index a257ed11..9d1975a5 100644 --- a/local/oudbase/doc/.oudbase.sha +++ b/local/oudbase/doc/.oudbase.sha @@ -1,13 +1,13 @@ -4a2db4913f0089a9fa928597eec40cc4df1f618c ./bin/oud_functions.sh -398c39df6e608a10c566801cd3dd90cb1a5d5fa4 ./bin/setup_oud_patch.sh -e8f077f1fd0ce02e54eaa457d7be98627fecd22a ./bin/oud_status.sh -adfce1e75d7cad64bad56b1dd7636df5575ad8de ./bin/setup_oud.sh -bfa1d5f014ce3e93d3b0e9f61fbfc24ddffd8ca1 ./bin/oud_start_stop.sh -543548cdde25487492e8efdac5439e87a6548e60 ./bin/oud_start_stop_all -3b2e2dd3495c5ca7fc4c3a06b4a7dc4312dabffc ./bin/oud_export.sh -3e45b3062c457cde2adcd896c3ebaf31f1c32ea0 ./bin/oud_backup.sh -e3237505feee359713984766a0f4fbfea9528549 ./bin/oudenv.sh -0ec75d000b319721c0c72d3733f2911bdf739d67 ./bin/oud_eusm.sh +0ddd5865eb795d96115549d4e4a2a95d4bff2a5b ./bin/oud_functions.sh +9300b875cf32573fd86d7cc3d6bef51968f26b61 ./bin/setup_oud_patch.sh +ad7a764ec84274f56ca13fdb5d790c2f5e8b69a9 ./bin/oud_status.sh +cf7526d48ce330544994f623e62c09c1d5c4d26f ./bin/setup_oud.sh +ce62e676902ad0639e3ae581fd4a0c6400b20ab1 ./bin/oud_start_stop.sh +05d1fe524a6273383072ccc994b1d925f63e1ce4 ./bin/oud_start_stop_all +a8d9bf624fb5a41e5a0f785a85b9d51f5b0c41dc ./bin/oud_export.sh +d6088e10b576e7aaeca31dc993b00320f3afbd0a ./bin/oud_backup.sh +dd090e5227b0244b39c7e534055f426d32a4727d ./bin/oudenv.sh +06e2f1a299e1cd146250225c4d0d78b66c2b21f3 ./bin/oud_eusm.sh c663fb651540b06c32791da7ac6f2d4297f85e7e ./etc/oudenv_core.conf e931ecdf86bc0b5b2f00f0926366c160281a71f5 ./etc/oudenv.conf 0918d6399a2471a32a3598beadaf19a129e9d296 ./etc/oudtab @@ -59,7 +59,7 @@ cd0ac218d7e1c4f70675ceb357c12e372af255c5 ./templates/create/generic/setup_oud_i 85258698779fbc00895e814debfe93092a9b9723 ./templates/create/generic/04_create_root_user.ldif 1360d0ce41418f0d8ce670734d3c668833755958 ./templates/create/generic/02_config_basedn.ldif 5b69d5f354d083ee5a155217641fe9e67cf85b92 ./templates/create/generic/14_create_demo_users.sh -d7bd955f1e813aed95edb32bbcc761444b6dd114 ./templates/create/generic/01_create_eus_instance.sh +772cc84efe6a5025e55a9073c6e0fe7f5ee236b5 ./templates/create/generic/01_create_eus_instance.sh 000a4a38b2430514c2a50614bcb263feeec61ff0 ./templates/create/generic/20_run_on_host2.sh 000a4a38b2430514c2a50614bcb263feeec61ff0 ./templates/create/generic/20_run_on_host3.sh 98db707a940f1f03286979acafe56d9f12818258 ./templates/create/generic/README.md @@ -113,4 +113,4 @@ a628df234707d2efa4fc8c8a7d96f432961ef95b ./templates/create/oudsm_domain/README 1337ac35543d467a1e9516d26e0bd99d6b83a967 ./templates/create/oudsm_domain/create_oudsm.py 8624bcdae55baeef00cd11d5dfcfa60f68710a02 ./doc/LICENSE 3dca8b335210846b8ff3447a6d68e02d22f31272 ./doc/README.md -1153f952d263ec8f46b8f4ebf551302449017b86 ./doc/.version +5b4bdf4f94ba60d870421b74aac06f91ede09afb ./doc/.version diff --git a/local/oudbase/doc/.version b/local/oudbase/doc/.version index 2fc55576..a64c44b7 100644 --- a/local/oudbase/doc/.version +++ b/local/oudbase/doc/.version @@ -1,6 +1,6 @@ -OUD Base Release v1.9.4 (https://github.com/oehrlis/oudbase) +OUD Base Release v1.9.5 (https://github.com/oehrlis/oudbase) ------------------------------------------------------------ -The following files of oudbase are changed/added (compared to v1.9.4): +The following files of oudbase are changed/added (compared to v1.9.5): ---------------------------------------------------------------------- diff --git a/local/oudbase/templates/create/generic/01_create_eus_instance.sh b/local/oudbase/templates/create/generic/01_create_eus_instance.sh index 7584eb3c..398407a0 100755 --- a/local/oudbase/templates/create/generic/01_create_eus_instance.sh +++ b/local/oudbase/templates/create/generic/01_create_eus_instance.sh @@ -80,7 +80,7 @@ if [ ! -f "${OUD_INSTANCE_HOME}/OUD/config/config.ldif" ]; then --generateSelfSignedCertificate \ --enableStartTLS \ --baseDN "${BASEDN}" \ - --integration EUS \ + --integration generic \ --serverTuning jvm-default \ --offlineToolsTuning autotune \ --no-prompt