Skip to content

Commit

Permalink
Merge pull request appwrite#7 from appwrite/feat-0.10
Browse files Browse the repository at this point in the history
update for 0.10
  • Loading branch information
eldadfux authored Sep 5, 2021
2 parents b9359e0 + 7269862 commit 16d2636
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 10 deletions.
2 changes: 1 addition & 1 deletion files/etc/update-motd.d/99-appwrite-readme
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cat <<EOF
\_/\_/(__) (__) (_/\_)(__\_)(__) (__) (____)(_)(__)\__/
Welcome to Appwrite!
Appwrite is a self-hosted solution that provides developers with a set of easy-to-use and integrate REST APIs to manage their core backend needs.
Appwrite is a self-hosted solution that provides developers with a set of easy-to-use and integrate REST APIs to manage their core backend needs. Now introduced with new Realtime service. More info at https://appwrite.io/docs/realtime
Access your Appwrite console at http://${myip} or any domain you have assigned.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ cd /root
docker run --rm \
--volume /var/run/docker.sock:/var/run/docker.sock \
--volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
appwrite/appwrite:0.9.4 sh -c "install --httpPort=80 --httpsPort=443 --interactive=N"
appwrite/appwrite:0.10.0 sh -c "install --httpPort=80 --httpsPort=443 --interactive=N"
4 changes: 2 additions & 2 deletions scripts/02-setup-appwrite-scripts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ echo "==============================================="
echo "= Pulling docker images ="
echo "==============================================="

docker pull appwrite/appwrite:0.9.4
docker pull traefik:2.3
docker pull appwrite/appwrite:0.10.0
docker pull traefik:2.5
docker pull appwrite/mariadb:1.2.0
docker pull redis:6.0-alpine3.12
docker pull appwrite/influxdb:1.0.0
Expand Down
24 changes: 18 additions & 6 deletions scripts/99-image_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function checkAgent {
echo -en "\e[41m[FAIL]\e[0m DigitalOcean Monitoring Agent detected.\n"
((FAIL++))
STATUS=2
if [[ $OS == "CentOS Linux" ]]; then
if [[ $OS == "CentOS Linux" ]] || [[ $OS == "CentOS Stream" ]] || [[ $OS == "Rocky Linux" ]]; then
echo "The agent can be removed with 'sudo yum remove do-agent' "
elif [[ $OS == "Ubuntu" ]]; then
echo "The agent can be removed with 'sudo apt-get purge do-agent' "
Expand Down Expand Up @@ -345,7 +345,7 @@ function checkFirewall {
FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
((WARN++))
fi
elif [[ $OS == "CentOS Linux" ]]; then
elif [[ $OS == "CentOS Linux" ]] || [[ $OS == "CentOS Stream" ]] || [[ $OS == "Rocky Linux" ]]; then
if [ -f /usr/lib/systemd/system/csf.service ]; then
fw="csf"
if [[ $(systemctl status $fw >/dev/null 2>&1) ]]; then
Expand Down Expand Up @@ -442,7 +442,7 @@ function checkUpdates {
else
echo -en "\e[32m[PASS]\e[0m There are no pending security updates for this image.\n\n"
fi
elif [[ $OS == "CentOS Linux" ]]; then
elif [[ $OS == "CentOS Linux" ]] || [[ $OS == "CentOS Stream" ]] || [[ $OS == "Rocky Linux" ]]; then
echo -en "\nChecking for available security updates, this may take a minute...\n\n"

update_count=$(yum check-update --security --quiet | wc -l)
Expand Down Expand Up @@ -508,12 +508,10 @@ function checkMongoDB {
((PASS++))
fi

elif [[ $OS == "CentOS Linux" ]]; then
elif [[ $OS == "CentOS Linux" ]] || [[ $OS == "CentOS Stream" ]] || [[ $OS == "Rocky Linux" ]]; then

if [[ -f "/usr/bin/mongod" ]]; then
version=$(/usr/bin/mongod --version --quiet | grep "db version" | sed -e "s/^db\ version\ v//")


if version_gt $version 4.0.0; then
if version_gt $version 4.0.3; then
echo -en "\e[41m[FAIL]\e[0m An SSPL version of MongoDB is present"
Expand Down Expand Up @@ -604,6 +602,20 @@ elif [[ $OS == "CentOS Linux" ]]; then
else
osv=2
fi
elif [[ $OS == "CentOS Stream" ]]; then
ost=1
if [[ $VER == "8" ]]; then
osv=1
else
osv=2
fi
elif [[ $OS == "Rocky Linux" ]]; then
ost=1
if [[ $VER =~ "8." ]]; then
osv=1
else
osv=2
fi
else
ost=0
fi
Expand Down

0 comments on commit 16d2636

Please sign in to comment.