e097a909ab5199048b398119982760d512941463
wiki/info/landscape/creating-ec2-image-for-webserver-from-scratch.md
| ... | ... | @@ -123,7 +123,7 @@ lrwxrwxrwx 1 root root 75 Oct 20 09:00 notify-operators -> /home/wiki/git |
| 123 | 123 | lrwxrwxrwx 1 root root 78 Feb 8 2021 update_authorized_keys_for_landscape_managers -> /home/wiki/gitwiki/configuration/update_authorized_keys_for_landscape_managers |
| 124 | 124 | lrwxrwxrwx 1 root root 89 Feb 8 2021 update_authorized_keys_for_landscape_managers_if_changed -> /home/wiki/gitwiki/configuration/update_authorized_keys_for_landscape_managers_if_changed |
| 125 | 125 | ``` |
| 126 | -* set up ``crontab`` for ``root`` user (remove the symbolic link to ``/home/sailing/code/configuration/crontab`` if that had been created earlier) |
|
| 126 | +* set up ``crontab`` for ``root`` user (remove the symbolic link to ``/home/sailing/code/configuration/crontab`` if that had been created earlier). Note that configuration/crontabs, contain a selection of crontabs for different use cases, including the crontab-reverse-proxy and crontab-wiki (see below). |
|
| 127 | 127 | ``` |
| 128 | 128 | 0 10 1 * * export PATH=/bin:/usr/bin:/usr/local/bin; mail-events-on-my >/dev/null 2>/dev/null |
| 129 | 129 | * * * * * export PATH=/bin:/usr/bin:/usr/local/bin; sleep $(( $RANDOM * 60 / 32768 )); update_authorized_keys_for_landscape_managers_if_changed $( cat /root/ssh-key-reader.token ) https://security-service.sapsailing.com /root 2>&1 >>/var/log/sailing.err |
| ... | ... | @@ -190,7 +190,7 @@ write and quit, to install the cronjob. |
| 190 | 190 | * * * * * /home/wiki/gitwiki/configuration/switchoverArchive.sh "/etc/httpd/conf.d/000-macros.conf" 2 9 |
| 191 | 191 | ``` |
| 192 | 192 | |
| 193 | -If you want to quickly run this script, consider installing it in /usr/local/bin, via `ln -s TARGET_PATH LINK_NAME`, in that directory. |
|
| 193 | +If you want to quickly run this script, consider installing it in /usr/local/bin, via `ln -s TARGET_PATH LINK_NAME`. |
|
| 194 | 194 | |
| 195 | 195 | ## Basic setup for reverse proxy instance |
| 196 | 196 |
wiki/info/landscape/creating-ec2-image-from-scratch.md
| ... | ... | @@ -148,7 +148,7 @@ Instead of having the `ANDROID_HOME` environment variable be set in `/etc/profil |
| 148 | 148 | |
| 149 | 149 | Had to fiddle a little with the JDK being used. The default installation has an OpenJDK installed, and the AWS tools depend on it. Therefore, it cannot just be removed. As a result, it's important that `env.sh` has the correct `JAVA_HOME` set (/opt/jdk1.8.0_45, in this case). Otherwise, the OSGi environment won't properly start up. |
| 150 | 150 | |
| 151 | -For the ``root`` user create the symbolic link from ``/root/crontab`` to ``/home/sailing/code/configuration/crontab`` and run ``crontab crontab``. It adds the following crontab entry that is responsible for updating the SSH keys of the users with permission for landscape management in the ``/root/.ssh/authorized_keys`` file. |
|
| 151 | +For the ``root`` user create the symbolic link from ``/root/crontab`` to ``/home/sailing/code/configuration/crontabs/<whichever is most appropriate>`` and run ``crontab crontab``. It adds the following crontab entry that is responsible for updating the SSH keys of the users with permission for landscape management in the ``/root/.ssh/authorized_keys`` file. |
|
| 152 | 152 | ``` |
| 153 | 153 | * * * * * export PATH=/bin:/usr/bin:/usr/local/bin; sleep $(( $RANDOM * 60 / 32768 )); update_authorized_keys_for_landscape_managers_if_changed $( cat /root/ssh-key-reader.token ) https://security-service.sapsailing.com /root 2>&1 >>/var/log/sailing.err |
| 154 | 154 | ``` |