diff options
Diffstat (limited to 'modules.d/slx-ssl')
| -rwxr-xr-x | modules.d/slx-ssl/module-setup.sh | 13 | ||||
| -rw-r--r-- | modules.d/slx-ssl/services/s3-ssl-sat.service | 12 |
2 files changed, 4 insertions, 21 deletions
diff --git a/modules.d/slx-ssl/module-setup.sh b/modules.d/slx-ssl/module-setup.sh index 6e35b16f..618b8f80 100755 --- a/modules.d/slx-ssl/module-setup.sh +++ b/modules.d/slx-ssl/module-setup.sh @@ -9,13 +9,8 @@ depends() { } install() { # config.tgz unpacking happens in pre-pivot/90 - # TODO: BEFORE "copy network files", as we modify /etc/hosts - inst "$moddir/hooks/s3-ssl-sat.sh" \ - /usr/local/bin/s3-ssl-sat.sh - inst_simple "${moddir}/services/s3-ssl-sat.service" \ - "${systemdsystemunitdir}/s3-ssl-sat.service" - mkdir --parents \ - "${initdir}/${systemdsystemunitdir}/initrd.target.wants" - ln_r "${systemdsystemunitdir}/s3-ssl-sat.service" \ - "${systemdsystemunitdir}/initrd.target.wants/s3-ssl-sat.service" + slx_service "s3-ssl-sat" "Enable SSL communication with Satellite Server" \ + --after "s3-unpack-config-tgz.service" \ + --requires "s3-unpack-config-tgz.service" \ + --before "s3-copy-network-files.service" } diff --git a/modules.d/slx-ssl/services/s3-ssl-sat.service b/modules.d/slx-ssl/services/s3-ssl-sat.service deleted file mode 100644 index 95645334..00000000 --- a/modules.d/slx-ssl/services/s3-ssl-sat.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Enable SSL communication with Satellite Server -After=s3-unpack-config-tgz.service -Requires=s3-unpack-config-tgz.service -Before=initrd-switch-root.target -DefaultDependencies=no -IgnoreOnIsolate=true - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStart=/usr/local/bin/s3-ssl-sat.sh |