add PHP session settings

vz/azbyka/createbytask.int.sh

@@ -178,6 +178,9 @@ tune_php()
     [ -n "$PHP_max_execution_time" ] && subst "s|^max_execution_time =.*|max_execution_time = $PHP_max_execution_time|" $aphp
     [ -n "$PHP_allow_url_fopen" ] && subst "s|^allow_url_fopen =.*|allow_url_fopen = $PHP_allow_url_fopen|" $aphp
     [ -n "$PHP_disable_functions" ] && subst "s|^disable_functions =.*|disable_functions = $PHP_disable_functions|" $aphp
+    [ -n "$PHP_session_name" ] && subst "s|^session.name = .*|session.name = $PHP_session_name|" $aphp
+    [ -n "$PHP_session_cookie_domain" ] && subst "s|^session.cookie_domain = .*|session.cookie_domain = $PHP_session_cookie_domain|" $aphp
+
     if [ -n "$PHP_post_max_size" ] ; then
         subst "s|^post_max_size = .*|post_max_size = $PHP_post_max_size|" $aphp
         subst "s|^upload_max_filesize = .*|upload_max_filesize = $PHP_post_max_size|" $aphp

vz/azbyka/createbytask.sh

@@ -62,6 +62,7 @@ if [ -z "$AUSER" ] ; then
     fi
 fi
 
+# TODO:
 # Если домен не был явно задан в конфиге, берём из NAME
 if [ -z "$ADOMAIN" ] ; then
     ADOMAIN="$NAME"
@@ -83,14 +84,13 @@ assure $VEID
 
 # TODO
 # links:
-#    - memcached
 # TODO: do via docker compose
 # TODO: user Dockerfile
 if [ -n "$DOCKID" ] ; then
     mkdir -p composers/sites.d/
-cat <<EOF > composers/sites.d/$AUSER.yml
-  $AUSER:
-    container_name: $AUSER
+cat <<EOF > composers/sites.d/$ACONF.yml
+  $ACONF:
+    container_name: $ACONF
     restart: always
     build: dockers/altlinux-p9-apache2-php7
     command:
@@ -100,17 +100,17 @@ cat <<EOF > composers/sites.d/$AUSER.yml
       - $HOSTHOME/$AUSER:/home/$AUSER
 EOF
 if [ -n "$DOCKVOLUME" ] ; then
-cat <<EOF >> composers/sites.d/$AUSER.yml
+cat <<EOF >> composers/sites.d/$ACONF.yml
       - $DOCKVOLUME
 EOF
 fi
-cat <<EOF >> composers/sites.d/$AUSER.yml
+cat <<EOF >> composers/sites.d/$ACONF.yml
     cap_add:
       - SYS_ADMIN
     extra_hosts:
       - "sphinx.azbyka:$SPHINXHOST"
-      - "memcached memcached.azbyka:$MEMCACHEDHOST"
-      - "redis redis.azbyka:$MEMCACHEDHOST"
+      - "memcached memcached.azbyka memcached.$AUSER:$MEMCACHEDHOST"
+      - "redis redis.azbyka redis.$AUSER:$REDISHOST"
       - "mysql mysql.azbyka mysql.$AUSER:$MYSQLHOST"
       - "mariadb mariadb.azbyka mariadb.$AUSER:$MARIADBHOST"
 
@@ -120,7 +120,7 @@ cat <<EOF >> composers/sites.d/$AUSER.yml
 EOF
     composers/update_compose.sh
     #cd composers
-    DOCKID=$AUSER
+    DOCKID=$ACONF
     #evz destroy $DOCKID
     docker-compose -f composers/docker-compose.yml -p $BASENAME create $DOCKID || fatal
     #cd -