Remove and prepare to remove obsolete code, and correct get_sync call

This commit is contained in:
Alexandre CATTEAU 2022-05-14 16:56:54 +02:00
parent e273f3c676
commit 6b8d8cbb47

View File

@ -12,7 +12,7 @@
init() { init() {
echo "Starting initialization" echo "Starting initialization"
echo $fqdn > /etc/hostname echo $fqdn > /etc/hostname
sed -i -e "s/$default_hostname/$fqdn $hostname/g" /etc/hosts #sed -i -e "s/$default_hostname/$fqdn $hostname/g" /etc/hosts
localectl set-keymap $keymap localectl set-keymap $keymap
timedatectl set-timezone $timezone timedatectl set-timezone $timezone
systemctl disable apt-daily-upgrade.timer systemctl disable apt-daily-upgrade.timer
@ -55,10 +55,6 @@ set_cups_conf() {
cp $run_directory_path/cupsd.conf $cups_conf_path/cupsd.conf cp $run_directory_path/cupsd.conf $cups_conf_path/cupsd.conf
} }
set_sane_conf() {
systemctl enable saned.socket # FIXME that really needed?
}
ssh_pubkey() { ssh_pubkey() {
echo "Getting SSH public key" echo "Getting SSH public key"
sudo -H -u $user mkdir /home/$user/.ssh sudo -H -u $user mkdir /home/$user/.ssh
@ -87,7 +83,7 @@ tls_cert() {
set_apache() { set_apache() {
echo "Setting up Apache HTTP Server" echo "Setting up Apache HTTP Server"
cp $run_directory_path/apache-sites/scanservjs.conf $apache_sites_directory_path/ cp $run_directory_path/apache-sites/scanservjs.conf $apache_sites_directory_path/
a2dissite * a2dissite 000-default
a2ensite scanservjs a2ensite scanservjs
a2enmod ssl proxy proxy_http proxy_http2 a2enmod ssl proxy proxy_http proxy_http2
} }
@ -103,8 +99,8 @@ fi
run_directory_path=$(pwd) run_directory_path=$(pwd)
# Set parameters # Set parameters
default_hostname='pine64' #default_hostname='pine64'
hostname='pn1' #hostname='pn1'
fqdn='pn1.hr.kto.black' fqdn='pn1.hr.kto.black'
keymap='fr' keymap='fr'
timezone='Europe/Paris' timezone='Europe/Paris'
@ -127,9 +123,8 @@ apache_sites_directory_path='/etc/apache2/sites-available'
init init
install_packages install_packages
add_users add_users
get_conf get_sync
set_cups_conf set_cups_conf
set_sane_conf
ssh_pubkey ssh_pubkey
set_sshd_conf set_sshd_conf
install_scanservjs install_scanservjs