Commit 868da69a authored by Vitaly Lipatov's avatar Vitaly Lipatov

vz/azbyka: last fixes

parent 8cf55e57
DOCKID=RUN
DOCKERIMAGE=azbyka-altlinux-p10-apache2-php8.1
# OpenVZ # OpenVZ
TEMPLATE=etersoft-p8 TEMPLATE=etersoft-p8
......
...@@ -242,6 +242,7 @@ EOF ...@@ -242,6 +242,7 @@ EOF
#subst "s|^Listen .*|Listen $PORT|" /etc/httpd2/conf/ports-enabled/http.conf #subst "s|^Listen .*|Listen $PORT|" /etc/httpd2/conf/ports-enabled/http.conf
subst "s| *\(SetEnvIf.*\)|\n\ subst "s| *\(SetEnvIf.*\)|\n\
$APACHEALIAS\ $APACHEALIAS\
\n\
<Directory />\n\ <Directory />\n\
Options FollowSymLinks $APACHEDIROPTIONS\n\ Options FollowSymLinks $APACHEDIROPTIONS\n\
AllowOverride FileInfo AuthConfig Indexes\n\ AllowOverride FileInfo AuthConfig Indexes\n\
...@@ -305,7 +306,7 @@ tune_apache2_mediawiki() ...@@ -305,7 +306,7 @@ tune_apache2_mediawiki()
local i local i
# Note: A2ENMOD/A2DISMOD in tune_apache2 # Note: A2ENMOD/A2DISMOD in tune_apache2
for i in mod_php7 status remoteip setenvif rewrite session include ; do for i in mod_php8.1 status remoteip setenvif rewrite session include ; do
docmd a2enmod $i docmd a2enmod $i
done done
...@@ -337,6 +338,9 @@ EOF ...@@ -337,6 +338,9 @@ EOF
tune_local_memcached_redis() tune_local_memcached_redis()
{ {
# for access from sitebox
subst 's|^bind 127.0.0.1|bind 0.0.0.0|' /etc/redis/redis.conf
subst 's|^LISTEN="127.0.0.1"|LISTEN="0.0.0.0"|' /etc/sysconfig/memcached
serv redis on serv redis on
serv memcached on serv memcached on
...@@ -394,6 +398,12 @@ for i in $PKGPROFILE ; do ...@@ -394,6 +398,12 @@ for i in $PKGPROFILE ; do
tune_local_memcached_redis tune_local_memcached_redis
tune_monit_apache2 tune_monit_apache2
;; ;;
apache2-php8)
tune_php /etc/php/8.?/apache2-mod_php/php.ini
tune_apache2
tune_local_memcached_redis
tune_monit_apache2
;;
apache2-php7-mediawiki) apache2-php7-mediawiki)
# FIXME: # FIXME:
tune_hosts_host03 tune_hosts_host03
......
...@@ -31,7 +31,7 @@ cat <<EOF > composers/sites.d/$ACONF.yml ...@@ -31,7 +31,7 @@ cat <<EOF > composers/sites.d/$ACONF.yml
$ACONF: $ACONF:
container_name: $ACONF container_name: $ACONF
restart: always restart: always
image: azbyka-altlinux-p9-apache2-php7.4 image: $DOCKERIMAGE
command: command:
- /sbin/systemd - /sbin/systemd
volumes: volumes:
...@@ -145,6 +145,8 @@ else ...@@ -145,6 +145,8 @@ else
fatal "Empty apache/$ACONF.conf, skipped" fatal "Empty apache/$ACONF.conf, skipped"
fi fi
st ls -l /tmp
cat apache/prepend.php | st tee /tmp/prepend.php >/dev/null cat apache/prepend.php | st tee /tmp/prepend.php >/dev/null
st test -s /tmp/prepend.php || fatal "Empty prepend.php" st test -s /tmp/prepend.php || fatal "Empty prepend.php"
......
#!/bin/sh
for task in vopros bogosluzhenie; do
./createbytask.sh $task --force
done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment