Add second UUID to template

[infodrom/musiikki-web.git] / install-system

diff --git a/install-system b/install-system
index 448a3b8..8e0e342 100755 (executable)
--- a/install-system
+++ b/install-system
@@ -297,7 +297,20 @@ assert_packages()
 
     echo_verbose "Looking for installed packages: "
 
-    for pkg in sudo super rsync hostapd isc-dhcp-server minidlna lighttpd samba php7.0-cgi php7.0-json
+    for pkg in sudo super rsync hostapd isc-dhcp-server minidlna lighttpd samba
+    do
+       echo_verbose "${pkg}... "
+       if ! package_exists ${pkg}
+       then
+           missing="$missing $pkg"
+       fi
+    done
+
+    echo_verbose "php... "
+    php_cgi=$(apt-cache search php7*-cgi|cut -d' ' -f 1|grep php7.*-cgi|sort|tail -n 1)
+    php=${php_cgi%-cgi}
+
+    for pkg in ${php}-cgi ${php}-json ${php}-sqlite3
     do
        echo_verbose "${pkg}... "
        if ! package_exists ${pkg}
@@ -371,10 +384,46 @@ assert_hostapd()
     fi
 }
 
+assert_network()
+{
+    if ! grep -q '^source /etc/network/interfaces.d/wlan1.conf' /etc/network/interfaces
+    then
+       echo >> /etc/network/interfaces
+       echo 'source /etc/network/interfaces.d/wlan1.conf' >> /etc/network/interfaces
+       echo >> /etc/network/interfaces
+    fi
+
+    sed -i 's!#net.ipv4.ip_forward=1!net.ipv4.ip_forward=1!' /etc/sysctl.conf
+    if ! grep -q '^net.ipv4.ip_forward=1' /etc/sysctl.conf
+    then
+       echo >> /etc/sysctl.conf
+       echo 'net.ipv4.ip_forward=1' >> /etc/sysctl.conf
+    fi
+
+    # iptables -t nat -A POSTROUTING -o wlan0 -j MASQUERADE
+    # iptables -A FORWARD -i wlan0 -o wlan1 -m state --state RELATED,ESTABLISHED -j ACCEPT
+    # iptables -A FORWARD -i wlan1 -o wlan0 -j ACCEPT
+    # iptables-save > /srv/musiikki/iptables_nat.conf
+}
+
 assert_dhcpd()
 {
     assert_system_subnet
 
+    if [ ! -f /etc/network/interfaces.d/wlan0.conf ]
+    then
+       cat <<EOT > /etc/network/interfaces.d/wlan0.conf
+auto wlan0
+iface wlan0 inet static
+        address ${opt_subnet}.1
+        netmask 255.255.255.0
+        broadcast ${opt_subnet}.255
+        network ${opt_subnet}.0
+        #gateway ${opt_subnet}.1
+EOT
+       echo "source /etc/network/interfaces.d/wlan0.conf" >> /etc/network/interfaces
+    fi
+
     if ! grep -q "^subnet ${opt_subnet}.0 " /etc/dhcp/dhcpd.conf
     then
        echo_ok "Add DHCP configuration"
@@ -425,6 +474,9 @@ assert_minidlna()
 
     test -d /media/music/cache || install -d -m 755 /media/music/cache
     chown -R minidlna:minidlna /media/music/cache
+
+    test -d /media/music/music/playlists || install -d -m 755 /media/music/music/playlists
+    chown -R www-data:www-data /media/music/music/playlists
 }
 
 assert_lighttpd()
@@ -544,6 +596,7 @@ assert_packages || exit 2
 
 assert_musiikki
 assert_hostapd
+assert_network
 assert_dhcpd
 assert_super
 assert_minidlna