diff options
| author | Christian Rößler | 2017-07-31 19:04:50 +0200 |
|---|---|---|
| committer | Christian Rößler | 2017-07-31 19:04:50 +0200 |
| commit | d7b4527c491401cd5a6b0fb65fed60cd1b064a51 (patch) | |
| tree | c13833f8afdc83f096b22e5750445babc67d86d4 /satellit_installer/includes | |
| parent | [SSUS] Confirm update; patch post_max_size; delete dummy coursebackend (diff) | |
| download | setup-scripts-d7b4527c491401cd5a6b0fb65fed60cd1b064a51.tar.gz setup-scripts-d7b4527c491401cd5a6b0fb65fed60cd1b064a51.tar.xz setup-scripts-d7b4527c491401cd5a6b0fb65fed60cd1b064a51.zip | |
[SSPS] For Debian 9, ipxe patch changed etc.
Diffstat (limited to 'satellit_installer/includes')
| -rw-r--r-- | satellit_installer/includes/00-variables.inc | 6 | ||||
| -rw-r--r-- | satellit_installer/includes/10-configurations.inc | 9 | ||||
| -rw-r--r-- | satellit_installer/includes/10-install_ipxe.inc | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/satellit_installer/includes/00-variables.inc b/satellit_installer/includes/00-variables.inc index 7701106..c0f4546 100644 --- a/satellit_installer/includes/00-variables.inc +++ b/satellit_installer/includes/00-variables.inc @@ -22,15 +22,15 @@ PACKAGELIST_SCRIPT="cracklib-runtime wget" # lithe and lean. So, if you add a package here make sure it installs using these options. # If this is not the case or in doubt use PACKAGELIST_WITH_RECOMMENDS below. PACKAGELIST_SERVER=" - mysql-server lighttpd atftpd php5-cgi php5-curl cifs-utils - sudo php5-common php5-mysqlnd php5-cli nfs-kernel-server curl + mysql-server lighttpd atftpd php-cgi php-curl cifs-utils php-mbstring + sudo php-common php-mysqlnd php-cli nfs-kernel-server curl nfs-common libowfat0 ldap-utils vim gcc make unattended-upgrades gnupg libowfat-dev libssl-dev gcc make liblzma-dev tmate " # Enter here packages needing installation of recommended packages as determines by apt-get: PACKAGELIST_WITH_RECOMMENDS=" - openjdk-7-jre-headless open-vm-tools + openjdk-8-jre-headless open-vm-tools " # (java simply fails otherwise, open-vm-tools needs recommended packages for its kernel modules) diff --git a/satellit_installer/includes/10-configurations.inc b/satellit_installer/includes/10-configurations.inc index 45af103..f9072e0 100644 --- a/satellit_installer/includes/10-configurations.inc +++ b/satellit_installer/includes/10-configurations.inc @@ -67,7 +67,7 @@ patch_lighttpd_config() { patch_php_config() { echo -n "# Patching php configuration... " - local PHPINIFILE=/etc/php5/cgi/php.ini + local PHPINIFILE=/etc/php/7.0/cgi/php.ini if [ -f "$PHPINIFILE" ]; then grep -E "^\s*upload_max_filesize" "$PHPINIFILE" # 2>/dev/null 1>&2 @@ -79,6 +79,13 @@ patch_php_config() { echo -n "no upload_max_filesize entry found; appending 100M entry... " echo "upload_max_filesize = 100M" >> "$PHPINIFILE" fi + + if grep -q -E '^\s*post_max_size' "$PHPINIFILE"; then + sed -i -e '/^\s*post_max_size/c\post_max_size = 100M' "$PHPINIFILE" || pwarning "Could not increase PHP upload limit" + else + echo "post_max_size = 100M" >> "$PHPINIFILE" || pwarning "Could not increase PHP upload limit" + fi + echo "ok." service lighttpd reload else diff --git a/satellit_installer/includes/10-install_ipxe.inc b/satellit_installer/includes/10-install_ipxe.inc index 1fb14d3..cbbd509 100644 --- a/satellit_installer/includes/10-install_ipxe.inc +++ b/satellit_installer/includes/10-install_ipxe.inc @@ -5,7 +5,7 @@ install_ipxe() { # git clone --depth 1 git://git.ipxe.org/ipxe.git "$1" || perror "Cloning ipxe repo failed" git clone git://git.ipxe.org/ipxe.git "$1" || perror "Cloning ipxe repo failed" cd "$1" - git reset --hard 6a3ffa0114411ae4aa6c4485c6058bf03fec3623 + git reset --hard 936657832f2262ad04bdf16b9229ce0b1d1c174f git apply --ignore-whitespace < "${BASEDIR}/static_files/ipxe.patch" || perror "Could not patch ipxe compile-time configuration" cd - > /dev/null wget -O "$1/pxelinux.0" "$HTTP_BASE/pxelinux.0" || perror "Could not download pxelinux 4 from $HTTP_BASE" |