Skip to content

Commit bd51f53

Browse files
committed
modified: bin/container/domainctl.sh
modified: docker-compose.yml
1 parent 17bff79 commit bd51f53

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

bin/container/domainctl.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,16 @@ add_domain(){
9494
if [ "${CK_RESULT}" != '' ]; then
9595
echo "# It appears the domain already exist! Check the ${LS_HTTPD_CONF} if you believe this is a mistake!"
9696
exit 1
97-
fi
97+
fi
98+
add_ls_domain
9899
elif [ "${LSV}" = 'openlitespeed' ]; then
99100
check_duplicate "member.*${DOMAIN}" ${OLS_HTTPD_CONF}
100101
if [ "${CK_RESULT}" != '' ]; then
101102
echo "# It appears the domain already exist! Check the ${OLS_HTTPD_CONF} if you believe this is a mistake!"
102103
exit 1
103-
fi
104-
fi
105-
add_ls_domain
106-
add_ols_domain
104+
fi
105+
add_ols_domain
106+
fi
107107
}
108108

109109
del_ls_domain(){
@@ -129,15 +129,15 @@ del_domain(){
129129
echo "# Domain non-exist! Check the ${LS_HTTPD_CONF} if you believe this is a mistake!"
130130
exit 1
131131
fi
132+
del_ls_domain ${1}
132133
elif [ "${LSV}" = 'openlitespeed' ]; then
133134
check_duplicate "member.*${DOMAIN}" ${OLS_HTTPD_CONF}
134135
if [ "${CK_RESULT}" = '' ]; then
135136
echo "# Domain non-exist! Check the ${OLS_HTTPD_CONF} if you believe this is a mistake!"
136137
exit 1
137-
fi
138+
fi
139+
del_ols_domain ${1}
138140
fi
139-
del_ls_domain ${1}
140-
del_ols_domain ${1}
141141
}
142142

143143
check_input ${1}

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ services:
3434
networks:
3535
- default
3636
phpmyadmin:
37-
image: bitnami/phpmyadmin:5.2.0-debian-11-r43
37+
image: bitnami/phpmyadmin:5.2.2
3838
ports:
3939
- 8080:8080
4040
- 8443:8443
4141
environment:
4242
DATABASE_HOST: mysql
4343
restart: always
4444
elasticsearch:
45-
image: docker.elastic.co/elasticsearch/elasticsearch:7.9.1
45+
image: docker.elastic.co/elasticsearch/elasticsearch:8.17.3
4646
environment:
4747
- discovery.type=single-node
4848
ports:

0 commit comments

Comments
 (0)