|
@@ -1417,22 +1417,22 @@ function set_default_onion_domains {
|
1417
|
1417
|
return
|
1418
|
1418
|
fi
|
1419
|
1419
|
|
1420
|
|
- if [ $OWNCLOUD_DOMAIN_NAME ]; then
|
|
1420
|
+ if [ ${#OWNCLOUD_DOMAIN_NAME} -gt 1 ]; then
|
1421
|
1421
|
OWNCLOUD_DOMAIN_NAME='owncloud.local'
|
1422
|
1422
|
fi
|
1423
|
|
- if [ $MICROBLOG_DOMAIN_NAME ]; then
|
|
1423
|
+ if [ ${#MICROBLOG_DOMAIN_NAME} -gt 1 ]; then
|
1424
|
1424
|
MICROBLOG_DOMAIN_NAME='microblog.local'
|
1425
|
1425
|
fi
|
1426
|
|
- if [ $FULLBLOG_DOMAIN_NAME ]; then
|
|
1426
|
+ if [ ${#FULLBLOG_DOMAIN_NAME} -gt 1 ]; then
|
1427
|
1427
|
FULLBLOG_DOMAIN_NAME='blog.local'
|
1428
|
1428
|
fi
|
1429
|
|
- if [ $WIKI_DOMAIN_NAME ]; then
|
|
1429
|
+ if [ ${#WIKI_DOMAIN_NAME} -gt 1 ]; then
|
1430
|
1430
|
WIKI_DOMAIN_NAME='wiki.local'
|
1431
|
1431
|
fi
|
1432
|
|
- if [ $DEFAULT_DOMAIN_NAME ]; then
|
|
1432
|
+ if [ ${#DEFAULT_DOMAIN_NAME} -gt 1 ]; then
|
1433
|
1433
|
DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local"
|
1434
|
1434
|
fi
|
1435
|
|
- if [ $GIT_DOMAIN_NAME ]; then
|
|
1435
|
+ if [ ${#GIT_DOMAIN_NAME} -gt 1 ]; then
|
1436
|
1436
|
GIT_DOMAIN_NAME='git.local'
|
1437
|
1437
|
fi
|
1438
|
1438
|
}
|
|
@@ -1652,7 +1652,7 @@ function test_domain_name {
|
1652
|
1652
|
|
1653
|
1653
|
# check that domain names are sensible
|
1654
|
1654
|
function check_domains {
|
1655
|
|
- if [ $WIKI_DOMAIN_NAME ]; then
|
|
1655
|
+ if [ ${#WIKI_DOMAIN_NAME} -gt 1 ]; then
|
1656
|
1656
|
test_domain_name "$WIKI_DOMAIN_NAME"
|
1657
|
1657
|
|
1658
|
1658
|
if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then
|
|
@@ -1671,7 +1671,7 @@ function check_domains {
|
1671
|
1671
|
echo $'Wiki domain name is the same as hubzilla domain name. They must be different'
|
1672
|
1672
|
exit 65848
|
1673
|
1673
|
fi
|
1674
|
|
- if [ $GIT_DOMAIN_NAME ]; then
|
|
1674
|
+ if [ ${#GIT_DOMAIN_NAME} -gt 1 ]; then
|
1675
|
1675
|
if [[ "$test_domain_name" == "$GIT_DOMAIN_NAME" ]]; then
|
1676
|
1676
|
echo $'Wiki domain name is the same as Gogs domain name. They must be different'
|
1677
|
1677
|
exit 73529
|
|
@@ -1679,7 +1679,7 @@ function check_domains {
|
1679
|
1679
|
fi
|
1680
|
1680
|
fi
|
1681
|
1681
|
|
1682
|
|
- if [ $OWNCLOUD_DOMAIN_NAME ]; then
|
|
1682
|
+ if [ ${#OWNCLOUD_DOMAIN_NAME} -gt 1 ]; then
|
1683
|
1683
|
test_domain_name "$OWNCLOUD_DOMAIN_NAME"
|
1684
|
1684
|
|
1685
|
1685
|
if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
|
|
@@ -1706,7 +1706,7 @@ function check_domains {
|
1706
|
1706
|
fi
|
1707
|
1707
|
fi
|
1708
|
1708
|
|
1709
|
|
- if [ $FULLBLOG_DOMAIN_NAME ]; then
|
|
1709
|
+ if [ ${#FULLBLOG_DOMAIN_NAME} -gt 1 ]; then
|
1710
|
1710
|
test_domain_name "$FULLBLOG_DOMAIN_NAME"
|
1711
|
1711
|
|
1712
|
1712
|
if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
|
|
@@ -1733,7 +1733,7 @@ function check_domains {
|
1733
|
1733
|
fi
|
1734
|
1734
|
fi
|
1735
|
1735
|
|
1736
|
|
- if [ $MICROBLOG_DOMAIN_NAME ]; then
|
|
1736
|
+ if [ ${#MICROBLOG_DOMAIN_NAME} -gt 1 ]; then
|
1737
|
1737
|
test_domain_name "$MICROBLOG_DOMAIN_NAME"
|
1738
|
1738
|
|
1739
|
1739
|
if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
|
|
@@ -1779,7 +1779,7 @@ function check_domains {
|
1779
|
1779
|
echo $'Hubzilla domain name is the same as microblog domain name. They must be different'
|
1780
|
1780
|
exit 83683
|
1781
|
1781
|
fi
|
1782
|
|
- if [ $GIT_DOMAIN_NAME ]; then
|
|
1782
|
+ if [ ${#GIT_DOMAIN_NAME} -gt 1 ]; then
|
1783
|
1783
|
if [[ "$test_domain_name" == "$GIT_DOMAIN_NAME" ]]; then
|
1784
|
1784
|
echo $'Hubzilla domain name is the same as Gogs domain name. They must be different'
|
1785
|
1785
|
exit 135523
|
|
@@ -1787,7 +1787,7 @@ function check_domains {
|
1787
|
1787
|
fi
|
1788
|
1788
|
fi
|
1789
|
1789
|
|
1790
|
|
- if [ $GIT_DOMAIN_NAME ]; then
|
|
1790
|
+ if [ ${#GIT_DOMAIN_NAME} -gt 1 ]; then
|
1791
|
1791
|
test_domain_name "$GIT_DOMAIN_NAME"
|
1792
|
1792
|
|
1793
|
1793
|
if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
|