diff --git a/setup/stack/config/master.cnf b/setup/stack/config/master.cnf index 3cc5e632..c295d872 100755 --- a/setup/stack/config/master.cnf +++ b/setup/stack/config/master.cnf @@ -658,10 +658,6 @@ file_roots: - /srv/salt/states/disable-xdebug enable-xdebug: - /srv/salt/states/enable-xdebug - php7.0: - - /srv/salt/states/php7.0 - php7.1: - - /srv/salt/states/php7.1 php7.2: - /srv/salt/states/php7.2 php7.3: diff --git a/setup/stack/states/ilias-postinstall/devmode/init.sls b/setup/stack/states/ilias-postinstall/devmode/init.sls index 93261874..7cebaada 100644 --- a/setup/stack/states/ilias-postinstall/devmode/init.sls +++ b/setup/stack/states/ilias-postinstall/devmode/init.sls @@ -2,4 +2,5 @@ file.replace: - pattern: '^DEBUG = "0"' - repl: 'DEVMODE = "1"\nUSE_WHOOPS = "1"' - - backup: false \ No newline at end of file + - backup: false + - ignore_if_missing: true \ No newline at end of file diff --git a/setup/stack/states/php7.0/php/init.sls b/setup/stack/states/php7.0/php/init.sls deleted file mode 100755 index 055f358d..00000000 --- a/setup/stack/states/php7.0/php/init.sls +++ /dev/null @@ -1,158 +0,0 @@ -apt_https: - pkg.installed: - - name: software-properties-common - -php_repo_list: - cmd.run: - - name: echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list - - unless: test -f /etc/apt/sources.list.d/php.list - -php_repo_key: - cmd.run: - - name: wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg - - unless: test -f /etc/apt/trusted.gpg.d/php.gpg - -php7.0: - pkg.installed: - - refresh: true - - pkgs: - - libapache2-mod-php7.0 - - php7.0 - - php7.0-curl - - php7.0-gd - - php7.0-json - - php7.0-mysql - - php7.0-readline - - php7.0-xsl - - php7.0-cli - - php7.0-zip - - php7.0-mbstring - - php7.0-xml - - php7.0-soap - - php7.0-bcmath - - php7.0-imap - - php7.0-xmlrpc - -php7.1: - pkg.removed: - - pkgs: - - libapache2-mod-php7.1 - - php7.1-curl - - php7.1-gd - - php7.1-json - - php7.1-mysql - - php7.1-readline - - php7.1-xsl - - php7.1-cli - - php7.1-zip - - php7.1-mbstring - - php7.1-soap - - php7.1-bcmath - - php7.1-imap - - php7.1-xmlrpc - -php7.2: - pkg.removed: - - pkgs: - - libapache2-mod-php7.2 - - php7.2-curl - - php7.2-gd - - php7.2-json - - php7.2-mysql - - php7.2-readline - - php7.2-xsl - - php7.2-cli - - php7.2-zip - - php7.2-mbstring - - php7.2-soap - - php7.2-bcmath - - php7.2-imap - - php7.2-xmlrpc - -php7.3: - pkg.removed: - - pkgs: - - libapache2-mod-php7.3 - - php7.3-curl - - php7.3-gd - - php7.3-json - - php7.3-mysql - - php7.3-readline - - php7.3-xsl - - php7.3-cli - - php7.3-zip - - php7.3-mbstring - - php7.3-soap - - php7.3-bcmath - - php7.3-imap - - php7.3-xmlrpc - -php7.4: - pkg.removed: - - pkgs: - - libapache2-mod-php7.4 - - php7.4-curl - - php7.4-gd - - php7.4-json - - php7.4-mysql - - php7.4-readline - - php7.4-xsl - - php7.4-cli - - php7.4-zip - - php7.4-mbstring - - php7.4-soap - - php7.4-bcmath - - php7.4-imap - - php7.4-xmlrpc - -php8.0: - pkg.removed: - - pkgs: - - libapache2-mod-php8.0 - - php8.0-mysql - - php8.0-readline - - php8.0-xsl - - php8.0-cli - - php8.0-soap - - php8.0-bcmath - - php8.0-imap - - php8.0-xmlrpc - -ini_filesize_apache2: - cmd.run: - - name: sed -i "/upload_max_filesize*/c upload_max_filesize = 4096M" /etc/php/7.0/apache2/php.ini - -ini_filesize_cli: - cmd.run: - - name: sed -i "/upload_max_filesize*/c upload_max_filesize = 4096M" /etc/php/7.0/cli/php.ini - -ini_postmax_apache2: - cmd.run: - - name: sed -i "/post_max_size*/c post_max_size = 4096M" /etc/php/7.0/apache2/php.ini - -ini_postmax_cli: - cmd.run: - - name: sed -i "/post_max_size*/c post_max_size = 4096M" /etc/php/7.0/cli/php.ini - -a2_disable_php73: - module.run: - - name: apache.a2dismod - - mod: php7.3 - -a2_disable_php74: - module.run: - - name: apache.a2dismod - - mod: php7.4 - -a2_enable_php: - module.run: - - name: apache.a2enmod - - mod: php7.0 - -update_alternatives_php: - cmd.run: - - name: update-alternatives --set php /usr/bin/php7.0 &>/dev/null - -apache2_supervisor_signal: - cmd.run: - - name: supervisorctl restart apache2 diff --git a/setup/stack/states/php7.1/php/init.sls b/setup/stack/states/php7.1/php/init.sls deleted file mode 100755 index bbe76d23..00000000 --- a/setup/stack/states/php7.1/php/init.sls +++ /dev/null @@ -1,158 +0,0 @@ -apt_https: - pkg.installed: - - name: software-properties-common - -php_repo_list: - cmd.run: - - name: echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list - - unless: test -f /etc/apt/sources.list.d/php.list - -php_repo_key: - cmd.run: - - name: wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg - - unless: test -f /etc/apt/trusted.gpg.d/php.gpg - -php7.1: - pkg.installed: - - refresh: true - - pkgs: - - libapache2-mod-php7.1 - - php7.1 - - php7.1-curl - - php7.1-gd - - php7.1-json - - php7.1-mysql - - php7.1-readline - - php7.1-xsl - - php7.1-cli - - php7.1-zip - - php7.1-mbstring - - php7.1-soap - - php7.1-bcmath - - php7.1-imap - - php7.1-xmlrpc - -php7.0: - pkg.removed: - - pkgs: - - libapache2-mod-php7.0 - - php7.0-curl - - php7.0-gd - - php7.0-json - - php7.0-mysql - - php7.0-readline - - php7.0-xsl - - php7.0-cli - - php7.0-zip - - php7.0-mbstring - - php7.0-xml - - php7.0-soap - - php7.0-bcmath - - php7.0-imap - - php7.0-xmlrpc - -php7.2: - pkg.removed: - - pkgs: - - libapache2-mod-php7.2 - - php7.2-curl - - php7.2-gd - - php7.2-json - - php7.2-mysql - - php7.2-readline - - php7.2-xsl - - php7.2-cli - - php7.2-zip - - php7.2-mbstring - - php7.2-soap - - php7.2-bcmath - - php7.2-imap - - php7.2-xmlrpc - -php7.3: - pkg.removed: - - pkgs: - - libapache2-mod-php7.3 - - php7.3-curl - - php7.3-gd - - php7.3-json - - php7.3-mysql - - php7.3-readline - - php7.3-xsl - - php7.3-cli - - php7.3-zip - - php7.3-mbstring - - php7.3-soap - - php7.3-bcmath - - php7.3-imap - - php7.3-xmlrpc - -php7.4: - pkg.removed: - - pkgs: - - libapache2-mod-php7.4 - - php7.4-curl - - php7.4-gd - - php7.4-json - - php7.4-mysql - - php7.4-readline - - php7.4-xsl - - php7.4-cli - - php7.4-zip - - php7.4-mbstring - - php7.4-soap - - php7.4-bcmath - - php7.4-imap - - php7.4-xmlrpc - -php8.0: - pkg.removed: - - pkgs: - - libapache2-mod-php8.0 - - php8.0-mysql - - php8.0-readline - - php8.0-xsl - - php8.0-cli - - php8.0-soap - - php8.0-bcmath - - php8.0-imap - - php8.0-xmlrpc - -ini_filesize_apache2: - cmd.run: - - name: sed -i "/upload_max_filesize*/c upload_max_filesize = 4096M" /etc/php/7.1/apache2/php.ini - -ini_filesize_cli: - cmd.run: - - name: sed -i "/upload_max_filesize*/c upload_max_filesize = 4096M" /etc/php/7.1/cli/php.ini - -ini_postmax_apache2: - cmd.run: - - name: sed -i "/post_max_size*/c post_max_size = 4096M" /etc/php/7.1/apache2/php.ini - -ini_postmax_cli: - cmd.run: - - name: sed -i "/post_max_size*/c post_max_size = 4096M" /etc/php/7.1/cli/php.ini - -a2_disable_php73: - module.run: - - name: apache.a2dismod - - mod: php7.3 - -a2_disable_php74: - module.run: - - name: apache.a2dismod - - mod: php7.4 - -a2_enable_php: - module.run: - - name: apache.a2enmod - - mod: php7.1 - -update_alternatives_php: - cmd.run: - - name: update-alternatives --set php /usr/bin/php7.1 &>/dev/null - -apache2_supervisor_signal: - cmd.run: - - name: supervisorctl restart apache2