Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/docs/cleanup-4.8' (docs update -…
Browse files Browse the repository at this point in the history
… broken link for /midpoint/install subtree)
  • Loading branch information
cz-help committed Feb 29, 2024
2 parents 767d3b8 + a5143f2 commit f6664f1
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docs/admin-gui/admin-gui-config/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -1925,7 +1925,7 @@ The property can be set in one of the following ways:
* Using command line argument:
** You can use JVM argument like `-Dmidpoint.additionalPackagesToScan=my.package`.
If using `midpoint.sh` or `start.sh`, this can be also provided with `JAVA_OPTS` environment variable.
The variable can also be set in `setenv.sh` file (see xref:/midpoint/install/distribution/#post-installation[this] for more).
The variable can also be set in `setenv.sh` file (see xref:/midpoint/install/bare-installation/distribution/#post-installation[this] for more).

** You can also use application argument `--midpoint.additionalPackagesToScan=my.package`,
which can be provided as an argument to `midpoint.sh` or `start.sh` scripts.
Expand Down
6 changes: 4 additions & 2 deletions docs/deployment/ninja/use-case/upgrade-with-ninja.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ TIP: [.purple]#You can also point ninja to already downloaded zip file using `--
+
TIP: You could use `--distribution-version{nbsp}latest` option to upgrade to an unreleased midPoint version (latest SNAPSHOT)

. Check your start-up script for midPoint: if you are using systemd or a custom script referring to `midpoint.war`, you need to replace the reference with `midpoint.jar`. See also xref:/midpoint/install/systemd/[Running midPoint with systemd].
. Check your start-up script for midPoint: if you are using systemd or a custom script referring to `midpoint.war`, you need to replace the reference with `midpoint.jar`.
See also xref:/midpoint/install/bare-installation/systemd/[Running midPoint with systemd].

. Start midPoint

Expand Down Expand Up @@ -486,7 +487,8 @@ NOTE: The initial objects that are new in midPoint 4.8 will be created upon firs
//. TODO TODO TODO what about security policy here?!


. Check your start-up script for midPoint: if you are using systemd or a custom script referring to `midpoint.war`, you need to replace the reference with `midpoint.jar`. See also xref:/midpoint/install/systemd/[Running midPoint with systemd].
. Check your start-up script for midPoint: if you are using systemd or a custom script referring to `midpoint.war`, you need to replace the reference with `midpoint.jar`.
See also xref:/midpoint/install/bare-installation/systemd/[Running midPoint with systemd].

. Start midPoint

Expand Down
4 changes: 2 additions & 2 deletions docs/deployment/stand-alone-deployment.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This is distinct from xref:/midpoint/reference/deployment/midpoint-home-director
or `midpoint.home`, which contains runtime configuration, logs, etc.

Please have a look at the xref:/midpoint/quickstart/[] page for basic installation instruction for the purposes of midPoint evaluation or demo.
See xref:/midpoint/install/distribution/[Installing MidPoint Server] page for full installation instructions.
See xref:/midpoint/install/bare-installation/distribution/[Installing MidPoint Server] page for full installation instructions.

== Run Control

Expand Down Expand Up @@ -62,7 +62,7 @@ bin/midpoint.sh stop
----

The `midpoint.sh` script may provide more run control and diagnostics capabilities in the future.
See also xref:/midpoint/install/midpoint-sh/[midpoint.sh page].
See also xref:/midpoint/install/bare-installation/midpoint-sh/[midpoint.sh page].

=== Windows

Expand Down
2 changes: 1 addition & 1 deletion docs/expressions/constants/configuration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The constants are defined in the midPoint configuration file (config.xml) in xre
[NOTE]
====
Instead of changing `config.xml` file you can set up the constants also as parameter or environment variables.
For more information check the xref:/midpoint/install/midpoint-sh.adoc[Start script] docs page.
For more information check the xref:/midpoint/install/bare-installation/midpoint-sh/[Start script] docs page.
Example of the syntax:
Expand Down
6 changes: 3 additions & 3 deletions docs/repository/native-postgresql/usage.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

To use midPoint with Native PostgreSQL repository you need to:

. Get the midPoint distribution and install it as described xref:/midpoint/install/distribution/[here];
. Get the midPoint distribution and install it as described xref:/midpoint/install/bare-installation/distribution/[here];
you can stop after unpacking the archive and setting up `MIDPOINT_HOME` environment variable.
. Install and set up the PostgreSQL database - this is the part covered by the bulk of this document.
. Prepare `config.xml` to configure midPoint for the Native repository.
Read xref:/midpoint/reference/repository/configuration/[Repository Configuration] for more information,
including a complete example of `config.xml` for Native repository.
. Finally, you can run midPoint; this is described in the rest of the xref:/midpoint/install/distribution/[installation document] mentioned in the first step.
. Finally, you can run midPoint; this is described in the rest of the xref:/midpoint/install/bare-installation/distribution/[installation document] mentioned in the first step.

== Database setup

Expand Down Expand Up @@ -273,7 +273,7 @@ The article references this page, but if you finished the steps above in this do

With the database ready and midPoint configuration file referencing the Native repository,
you can finally run midPoint, e.g. by running `bin/start.sh`.
More details on running midPoint are mentioned in the xref:/midpoint/install/distribution/[installation document].
More details on running midPoint are mentioned in the xref:/midpoint/install/bare-installation/distribution/[installation document].

== Versioning and upgrading

Expand Down
2 changes: 1 addition & 1 deletion docs/upgrade/faq-issues.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ If you have followed xref:/midpoint/reference/deployment/ninja/upgrade-with-ninj

Please check and fix your Systemd service unit file or service startup file for `midPoint.war` references and replace them with `midpoint.jar`.

See also xref:/midpoint/install/systemd/[Running midPoint with systemd].
See also xref:/midpoint/install/bare-installation/systemd/[Running midPoint with systemd].

[#_resource_schema_change]
=== Do I need to update my 4.4-based resources after upgrade to 4.8 LTS?
Expand Down
2 changes: 1 addition & 1 deletion docs/upgrade/upgrade-guide.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
:page-upkeep-status: green
:page-toc: top

This document describes the necessary steps to upgrade xref:/midpoint/install/distribution/[MidPoint installation].
This document describes the necessary steps to upgrade xref:/midpoint/install/bare-installation/distribution/[MidPoint installation].
It describes the usual steps, risks and consideration for upgrade, therefore it is quite comprehensive.

The document describes upgrade of _production_ environment.
Expand Down

0 comments on commit f6664f1

Please sign in to comment.