[SSPS] Refactor static_files: Submodules with tree

Add submodules (aka directories) to static_files, named according to
what component they are for. Add function "install_files" to copy the
contents of one of those modules to the root directory.
This should make the resulting setup more obvious and require less
manual copying of files everywhere.

47 files changed, 33 insertions, 38 deletions

diff --git a/satellit_installer/static_files/dnbd3/alt-servers b/satellit_installer/static_files/dnbd3/etc/dnbd3-server/alt-servers
index 4bf5a12..4bf5a12 100644
--- a/satellit_installer/static_files/dnbd3/alt-servers
+++ b/satellit_installer/static_files/dnbd3/etc/dnbd3-server/alt-servers
diff --git a/satellit_installer/static_files/dnbd3/rpc.acl b/satellit_installer/static_files/dnbd3/etc/dnbd3-server/rpc.acl
index 576757c..576757c 100644
--- a/satellit_installer/static_files/dnbd3/rpc.acl
+++ b/satellit_installer/static_files/dnbd3/etc/dnbd3-server/rpc.acl
diff --git a/satellit_installer/static_files/dnbd3/server.conf b/satellit_installer/static_files/dnbd3/etc/dnbd3-server/server.conf
index c2327d6..c2327d6 100644
--- a/satellit_installer/static_files/dnbd3/server.conf
+++ b/satellit_installer/static_files/dnbd3/etc/dnbd3-server/server.conf
diff --git a/satellit_installer/static_files/dnbd3/dnbd3-master-proxy.service b/satellit_installer/static_files/dnbd3/etc/systemd/system/dnbd3-master-proxy.service
index 332f64d..332f64d 100644
--- a/satellit_installer/static_files/dnbd3/dnbd3-master-proxy.service
+++ b/satellit_installer/static_files/dnbd3/etc/systemd/system/dnbd3-master-proxy.service
diff --git a/satellit_installer/static_files/dnbd3/dnbd3-server.service b/satellit_installer/static_files/dnbd3/etc/systemd/system/dnbd3-server.service
index c062609..c062609 100644
--- a/satellit_installer/static_files/dnbd3/dnbd3-server.service
+++ b/satellit_installer/static_files/dnbd3/etc/systemd/system/dnbd3-server.service
diff --git a/satellit_installer/static_files/dnbd3/etc/systemd/system/multi-user.target.wants/dnbd3-master-proxy.service b/satellit_installer/static_files/dnbd3/etc/systemd/system/multi-user.target.wants/dnbd3-master-proxy.service
new file mode 120000
index 0000000..013e595
--- /dev/null
+++ b/satellit_installer/static_files/dnbd3/etc/systemd/system/multi-user.target.wants/dnbd3-master-proxy.service
@@ -0,0 +1 @@
+../dnbd3-master-proxy.service
\ No newline at end of file
diff --git a/satellit_installer/static_files/dnbd3/etc/systemd/system/multi-user.target.wants/dnbd3-server.service b/satellit_installer/static_files/dnbd3/etc/systemd/system/multi-user.target.wants/dnbd3-server.service
new file mode 120000
index 0000000..b7ffd5b
--- /dev/null
+++ b/satellit_installer/static_files/dnbd3/etc/systemd/system/multi-user.target.wants/dnbd3-server.service
@@ -0,0 +1 @@
+../dnbd3-server.service
\ No newline at end of file
diff --git a/satellit_installer/static_files/finish_setup_public_key.pem b/satellit_installer/static_files/finish_setup_public_key.pem
deleted file mode 100644
index bc67f08..0000000
--- a/satellit_installer/static_files/finish_setup_public_key.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtfNz/RzI8XfNPhOlvSGU
-retnk8ShsItLNVDqtWf1GOfOG88S0d+wQtH6+GAuZTstfnPukWEsa1WWxUus0/PQ
-9KXKNfy3qpxTmPjHyBQgSlu7Q1hCh20q9IMySf43SmlkKPYtqO66XjtpzJBg0lQD
-lTP0PERJrKlwNhBxkrsyt2YPXzQpKEQrS7QQSRZqJigr/MjWsCe//2uk9a74do6D
-60X26+WXL8XGIeU/Rt8RLqG9i7woD1FummtQTmWhO3tQbok19iSn3MEKhPSMCA5S
-1cAveXxDZBnnVsAbsxwz9NufyWDqcRKtCe3YOWMsNKsuQPu+0elG59deeN0YYo5G
-lGKHgG/R6jXO0NDb3rB6tQCkNAtdwU5NROwH8An6XYH8ORa6rkD+nJRpWA+eD+mr
-Pn28XT4Qs6/BTNROfhT9VIVKXlux03yEgRTubxzLfGOza6T7KBvq30vqZ+oQiC7k
-uHG2SwO3IoxNvWe2e8UiK6OUiOI3hfqiWsyLuf4jsy6k8FtMj6usJXCaM2Ugm3r3
-Lkd64I/yqbSiScJnacHAL2c7JY0yPwxHs8Wsv35WzoDSrXvdjGpro9Eaho7F/45j
-FDov3wP89WyUxRkDZyZ+CCbSoO2Kp0bUR1qyOcAeKWVHf8qV6wAfGOe0SXfhPW6v
-efQQsHnImME3N5Rv4NSFTsMCAwEAAQ==
------END PUBLIC KEY-----
diff --git a/satellit_installer/static_files/ldadp/etc/systemd/system/ldadp@.service b/satellit_installer/static_files/ldadp/etc/systemd/system/ldadp@.service
new file mode 100644
index 0000000..b04118f
--- /dev/null
+++ b/satellit_installer/static_files/ldadp/etc/systemd/system/ldadp@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=LDAP-Proxy for AD/LDAP communication #%i
+ConditionFileNotEmpty=/opt/ldadp/configs/%i.cfg
+
+[Service]
+ExecStart=/opt/ldadp/ldadp -n /opt/ldadp/configs/%i.cfg
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/satellit_installer/static_files/lighttpd.conf b/satellit_installer/static_files/lighttpd/etc/lighttpd/lighttpd.conf
index 0ae7c9d..0ae7c9d 100644
--- a/satellit_installer/static_files/lighttpd.conf
+++ b/satellit_installer/static_files/lighttpd/etc/lighttpd/lighttpd.conf
diff --git a/satellit_installer/static_files/lighttpd/etc/systemd/system/lighttpd.service.d/10-dynamic_php_children.conf b/satellit_installer/static_files/lighttpd/etc/systemd/system/lighttpd.service.d/10-dynamic_php_children.conf
new file mode 100644
index 0000000..ab7d5f4
--- /dev/null
+++ b/satellit_installer/static_files/lighttpd/etc/systemd/system/lighttpd.service.d/10-dynamic_php_children.conf
@@ -0,0 +1,2 @@
+[Service]
+ExecStartPre=/usr/local/sbin/patch_lighttpd_phpchildren
diff --git a/satellit_installer/static_files/slx-cert b/satellit_installer/static_files/lighttpd/opt/openslx/slx-cert
index 3f5cc3e..3f5cc3e 100755
--- a/satellit_installer/static_files/slx-cert
+++ b/satellit_installer/static_files/lighttpd/opt/openslx/slx-cert
diff --git a/satellit_installer/static_files/patch_lighttpd_phpchildren b/satellit_installer/static_files/lighttpd/usr/local/sbin/patch_lighttpd_phpchildren
index a8e44e5..a8e44e5 100755
--- a/satellit_installer/static_files/patch_lighttpd_phpchildren
+++ b/satellit_installer/static_files/lighttpd/usr/local/sbin/patch_lighttpd_phpchildren
diff --git a/satellit_installer/static_files/lighttpd-auto-ssl.sh b/satellit_installer/static_files/lighttpd/usr/share/lighttpd/auto-ssl.sh
index 0f88864..0f88864 100755
--- a/satellit_installer/static_files/lighttpd-auto-ssl.sh
+++ b/satellit_installer/static_files/lighttpd/usr/share/lighttpd/auto-ssl.sh
diff --git a/satellit_installer/static_files/lighttpd-include-conf-d.sh b/satellit_installer/static_files/lighttpd/usr/share/lighttpd/include-conf-d.sh
index a54ed3f..a54ed3f 100755
--- a/satellit_installer/static_files/lighttpd-include-conf-d.sh
+++ b/satellit_installer/static_files/lighttpd/usr/share/lighttpd/include-conf-d.sh
diff --git a/satellit_installer/static_files/logging/80-dmsd.conf b/satellit_installer/static_files/logging/80-dmsd.conf
deleted file mode 100644
index 3554f43..0000000
--- a/satellit_installer/static_files/logging/80-dmsd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-:app-name, isequal, "dmsd" -/var/log/dmsd.log 
-& ~
diff --git a/satellit_installer/static_files/logging/90-taskmanager.conf b/satellit_installer/static_files/logging/90-taskmanager.conf
deleted file mode 100644
index 578d905..0000000
--- a/satellit_installer/static_files/logging/90-taskmanager.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-:app-name, isequal, "taskmanager" -/var/log/taskmanager.log 
-& ~
diff --git a/satellit_installer/static_files/logging/satellite-logrotate b/satellit_installer/static_files/logging/satellite-logrotate
deleted file mode 100644
index 2d1d946..0000000
--- a/satellit_installer/static_files/logging/satellite-logrotate
+++ /dev/null
@@ -1,14 +0,0 @@
-/var/log/dmsd.log
-/var/log/taskmanager.log
-{
-	rotate 7
-	daily
-	missingok
-	notifempty
-	delaycompress
-	compress
-	postrotate
-		invoke-rc.d rsyslog rotate > /dev/null
-	endscript
-}
-
diff --git a/satellit_installer/static_files/slxadmin-crontab b/satellit_installer/static_files/slxadmin/etc/cron.d/slx-admin
index c6ae537..c6ae537 100644
--- a/satellit_installer/static_files/slxadmin-crontab
+++ b/satellit_installer/static_files/slxadmin/etc/cron.d/slx-admin
diff --git a/satellit_installer/static_files/slxadmin/etc/systemd/system/multi-user.target.wants/slxadmin-boot.service b/satellit_installer/static_files/slxadmin/etc/systemd/system/multi-user.target.wants/slxadmin-boot.service
new file mode 120000
index 0000000..052f93e
--- /dev/null
+++ b/satellit_installer/static_files/slxadmin/etc/systemd/system/multi-user.target.wants/slxadmin-boot.service
@@ -0,0 +1 @@
+../slxadmin-boot.service
\ No newline at end of file
diff --git a/satellit_installer/static_files/slxadmin-boot.service b/satellit_installer/static_files/slxadmin/etc/systemd/system/slxadmin-boot.service
index 21bdf51..21bdf51 100644
--- a/satellit_installer/static_files/slxadmin-boot.service
+++ b/satellit_installer/static_files/slxadmin/etc/systemd/system/slxadmin-boot.service
diff --git a/satellit_installer/static_files/slxadmin-init/gpg-key.asc b/satellit_installer/static_files/slxadmin/opt/openslx/restore.d/slxadmin-init/gpg-key.asc
index abbe024..abbe024 100644
--- a/satellit_installer/static_files/slxadmin-init/gpg-key.asc
+++ b/satellit_installer/static_files/slxadmin/opt/openslx/restore.d/slxadmin-init/gpg-key.asc
diff --git a/satellit_installer/static_files/slxadmin-init/init.sh b/satellit_installer/static_files/slxadmin/opt/openslx/restore.d/slxadmin-init/init.sh
index b48a1bf..b48a1bf 100755
--- a/satellit_installer/static_files/slxadmin-init/init.sh
+++ b/satellit_installer/static_files/slxadmin/opt/openslx/restore.d/slxadmin-init/init.sh
diff --git a/satellit_installer/static_files/slxadmin-init/slxadmin-init.php b/satellit_installer/static_files/slxadmin/opt/openslx/restore.d/slxadmin-init/slxadmin-init.php
index ef3f0bd..ef3f0bd 100644
--- a/satellit_installer/static_files/slxadmin-init/slxadmin-init.php
+++ b/satellit_installer/static_files/slxadmin/opt/openslx/restore.d/slxadmin-init/slxadmin-init.php
diff --git a/satellit_installer/static_files/slxadmin-bootscript b/satellit_installer/static_files/slxadmin/opt/openslx/slxadmin-bootscript
index a959dfd..a959dfd 100755
--- a/satellit_installer/static_files/slxadmin-bootscript
+++ b/satellit_installer/static_files/slxadmin/opt/openslx/slxadmin-bootscript
diff --git a/satellit_installer/static_files/slxadmin-cronscript b/satellit_installer/static_files/slxadmin/opt/openslx/slxadmin-cronscript
index 4ab7a21..4ab7a21 100755
--- a/satellit_installer/static_files/slxadmin-cronscript
+++ b/satellit_installer/static_files/slxadmin/opt/openslx/slxadmin-cronscript
diff --git a/satellit_installer/static_files/slxadmin/srv/openslx/www/index.php b/satellit_installer/static_files/slxadmin/srv/openslx/www/index.php
new file mode 100644
index 0000000..9f21f0b
--- /dev/null
+++ b/satellit_installer/static_files/slxadmin/srv/openslx/www/index.php
@@ -0,0 +1,3 @@
+<?php
+Header('Location: /slx-admin/?do=main');
+Header('HTTP/1.1 301 Moved permanently');
diff --git a/satellit_installer/static_files/slxadmin-config.php b/satellit_installer/static_files/slxadmin/srv/openslx/www/slx-admin/config.php
index a239fef..a239fef 100644
--- a/satellit_installer/static_files/slxadmin-config.php
+++ b/satellit_installer/static_files/slxadmin/srv/openslx/www/slx-admin/config.php
diff --git a/satellit_installer/static_files/system/apt-upgrade-conf b/satellit_installer/static_files/system/etc/apt/apt.conf.d/02periodic
index 8d6d7c8..8d6d7c8 100644
--- a/satellit_installer/static_files/system/apt-upgrade-conf
+++ b/satellit_installer/static_files/system/etc/apt/apt.conf.d/02periodic
diff --git a/satellit_installer/static_files/tmpdelete.sh b/satellit_installer/static_files/system/etc/cron.daily/tmpdelete.sh
index 9e68658..9e68658 100755
--- a/satellit_installer/static_files/tmpdelete.sh
+++ b/satellit_installer/static_files/system/etc/cron.daily/tmpdelete.sh
diff --git a/satellit_installer/static_files/firstrun_script.sh b/satellit_installer/static_files/system/root/installer/firstrun_script.sh
index 343be4d..343be4d 100644..100755
--- a/satellit_installer/static_files/firstrun_script.sh
+++ b/satellit_installer/static_files/system/root/installer/firstrun_script.sh
diff --git a/satellit_installer/static_files/rclocal_script.sh b/satellit_installer/static_files/system/root/installer/rclocal_script.sh
index 07da0ee..07da0ee 100644..100755
--- a/satellit_installer/static_files/rclocal_script.sh
+++ b/satellit_installer/static_files/system/root/installer/rclocal_script.sh
diff --git a/satellit_installer/static_files/finalize b/satellit_installer/static_files/system/usr/local/bin/finalize
index 1be85e2..1be85e2 100755
--- a/satellit_installer/static_files/finalize
+++ b/satellit_installer/static_files/system/usr/local/bin/finalize
diff --git a/satellit_installer/static_files/slxlog b/satellit_installer/static_files/system/usr/local/bin/slxlog
index 55110ae..55110ae 100755
--- a/satellit_installer/static_files/slxlog
+++ b/satellit_installer/static_files/system/usr/local/bin/slxlog
diff --git a/satellit_installer/static_files/netsetup b/satellit_installer/static_files/system/usr/local/sbin/netsetup
index 6616c50..6616c50 100755
--- a/satellit_installer/static_files/netsetup
+++ b/satellit_installer/static_files/system/usr/local/sbin/netsetup
diff --git a/satellit_installer/static_files/taskmanager/etc/sudoers.d/taskmanager b/satellit_installer/static_files/taskmanager/etc/sudoers.d/taskmanager
new file mode 100644
index 0000000..b34bf9f
--- /dev/null
+++ b/satellit_installer/static_files/taskmanager/etc/sudoers.d/taskmanager
@@ -0,0 +1,12 @@
+# Sudoers configuration for user 'taskmanager'
+taskmanager ALL=(root) NOPASSWD: /opt/taskmanager/scripts/ldadp-launcher
+taskmanager ALL=(root) NOPASSWD: /sbin/reboot
+taskmanager ALL=(root) NOPASSWD: /bin/netstat
+taskmanager ALL=(root) NOPASSWD: /opt/taskmanager/scripts/systemctl
+taskmanager ALL=(root) NOPASSWD: /opt/taskmanager/scripts/mount-store
+taskmanager ALL=(root) NOPASSWD: /opt/taskmanager/scripts/system-backup
+taskmanager ALL=(root) NOPASSWD: /opt/taskmanager/scripts/system-restore
+taskmanager ALL=(root) NOPASSWD: /opt/taskmanager/scripts/install-https
+taskmanager ALL=(root) NOPASSWD: /opt/taskmanager/scripts/ldadp-setperms
+ALL ALL=(www-data) NOPASSWD: /usr/local/bin/slxlog
+Defaults env_keep += "TM_*"
diff --git a/satellit_installer/static_files/taskmanager/etc/systemd/system/multi-user.target.wants/taskmanager.service b/satellit_installer/static_files/taskmanager/etc/systemd/system/multi-user.target.wants/taskmanager.service
new file mode 120000
index 0000000..141a3f2
--- /dev/null
+++ b/satellit_installer/static_files/taskmanager/etc/systemd/system/multi-user.target.wants/taskmanager.service
@@ -0,0 +1 @@
+../taskmanager.service
\ No newline at end of file
diff --git a/satellit_installer/static_files/taskmanager/taskmanager.service b/satellit_installer/static_files/taskmanager/etc/systemd/system/taskmanager.service
index 97662cb..97662cb 100644
--- a/satellit_installer/static_files/taskmanager/taskmanager.service
+++ b/satellit_installer/static_files/taskmanager/etc/systemd/system/taskmanager.service
diff --git a/satellit_installer/static_files/taskmanager/config b/satellit_installer/static_files/taskmanager/opt/taskmanager/config/config
index 055dd13..055dd13 100644
--- a/satellit_installer/static_files/taskmanager/config
+++ b/satellit_installer/static_files/taskmanager/opt/taskmanager/config/config
diff --git a/satellit_installer/static_files/taskmanager/environment b/satellit_installer/static_files/taskmanager/opt/taskmanager/config/environment
index 7de812c..7de812c 100644
--- a/satellit_installer/static_files/taskmanager/environment
+++ b/satellit_installer/static_files/taskmanager/opt/taskmanager/config/environment
diff --git a/satellit_installer/static_files/tftpd/etc/systemd/system/multi-user.target.wants/tftpd-hpa.service b/satellit_installer/static_files/tftpd/etc/systemd/system/multi-user.target.wants/tftpd-hpa.service
new file mode 120000
index 0000000..c132ef5
--- /dev/null
+++ b/satellit_installer/static_files/tftpd/etc/systemd/system/multi-user.target.wants/tftpd-hpa.service
@@ -0,0 +1 @@
+../tftpd-hpa.service
\ No newline at end of file
diff --git a/satellit_installer/static_files/tftpd/tftpd-hpa.service b/satellit_installer/static_files/tftpd/etc/systemd/system/tftpd-hpa.service
index b92254a..b92254a 100644
--- a/satellit_installer/static_files/tftpd/tftpd-hpa.service
+++ b/satellit_installer/static_files/tftpd/etc/systemd/system/tftpd-hpa.service
diff --git a/satellit_installer/static_files/tftpd/tftpd-remap b/satellit_installer/static_files/tftpd/opt/openslx/tftpd-remap
index 1650e92..1650e92 100644
--- a/satellit_installer/static_files/tftpd/tftpd-remap
+++ b/satellit_installer/static_files/tftpd/opt/openslx/tftpd-remap
diff --git a/satellit_installer/static_files/tftpd/tftpd-hpa b/satellit_installer/static_files/tftpd/tftpd-hpa
deleted file mode 100644
index 1e4589b..0000000
--- a/satellit_installer/static_files/tftpd/tftpd-hpa
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/default/tftpd-hpa
-
-TFTP_USERNAME="tftp"
-TFTP_DIRECTORY="/srv/openslx/tftp"
-TFTP_ADDRESS="0.0.0.0:69"
-TFTP_OPTIONS="--secure"
diff --git a/satellit_installer/static_files/timesync/etc/systemd/system/network-online.target.wants/redneck-timesync.service b/satellit_installer/static_files/timesync/etc/systemd/system/network-online.target.wants/redneck-timesync.service
new file mode 120000
index 0000000..9f3e128
--- /dev/null
+++ b/satellit_installer/static_files/timesync/etc/systemd/system/network-online.target.wants/redneck-timesync.service
@@ -0,0 +1 @@
+../redneck-timesync.service
\ No newline at end of file
diff --git a/satellit_installer/static_files/timesync/redneck-timesync.service b/satellit_installer/static_files/timesync/etc/systemd/system/redneck-timesync.service
index e019a92..e019a92 100644
--- a/satellit_installer/static_files/timesync/redneck-timesync.service
+++ b/satellit_installer/static_files/timesync/etc/systemd/system/redneck-timesync.service
diff --git a/satellit_installer/static_files/timesync/redneck-timesync.sh b/satellit_installer/static_files/timesync/usr/local/sbin/redneck-timesync.sh
index 0175456..0175456 100755
--- a/satellit_installer/static_files/timesync/redneck-timesync.sh
+++ b/satellit_installer/static_files/timesync/usr/local/sbin/redneck-timesync.sh