bugfixes
This commit is contained in:
parent
90f8e7d485
commit
5f9407dea5
2 changed files with 13 additions and 9 deletions
|
@ -3,12 +3,6 @@
|
||||||
os=$(cat "$__global/explorer/os")
|
os=$(cat "$__global/explorer/os")
|
||||||
os_version=$(cat "$__global/explorer/os_version")
|
os_version=$(cat "$__global/explorer/os_version")
|
||||||
|
|
||||||
# remove this check, if there is support for othere OS
|
|
||||||
if [ ! "$os" = "debian" ]; then
|
|
||||||
echo "OS $os is currently not supported." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$os" in
|
case "$os" in
|
||||||
centos)
|
centos)
|
||||||
restart="/etc/init.d/nginx reload"
|
restart="/etc/init.d/nginx reload"
|
||||||
|
@ -54,7 +48,12 @@ domain=$(cat "$__object/parameter/domain")
|
||||||
|
|
||||||
# TODO check shasum of tar ball
|
# TODO check shasum of tar ball
|
||||||
cat <<eof
|
cat <<eof
|
||||||
INSTALL_STATE=\$([ -d /var/www/nextcloud ] && cd /var/www/nextcloud && sudo -u www-data php occ status| grep -o true)
|
if [ -d /var/www/nextcloud -a \$(cd /var/www/nextcloud; sudo -u www-data php occ status | grep -o true) ]; then
|
||||||
|
INSTALL_STATE=true
|
||||||
|
else
|
||||||
|
INSTALL_STATE=false
|
||||||
|
fi
|
||||||
|
echo \${INSTALL_STATE} > /tmp/install-state
|
||||||
if [ "\$INSTALL_STATE" != "true" ]; then
|
if [ "\$INSTALL_STATE" != "true" ]; then
|
||||||
curl -s -L ${nextcloud_uri} -o /tmp/nextcloud.tar.bz2
|
curl -s -L ${nextcloud_uri} -o /tmp/nextcloud.tar.bz2
|
||||||
tar -C /var/www -xvjf /tmp/nextcloud.tar.bz2
|
tar -C /var/www -xvjf /tmp/nextcloud.tar.bz2
|
||||||
|
|
9
manifest
9
manifest
|
@ -19,7 +19,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
os=$(cat "$__global/explorer/os")
|
os=$(cat "$__global/explorer/os")
|
||||||
if [ ! "$os" = "debian" ]
|
if [ ! "$os" = "debian" -a ! "$os" = "devuan" ]
|
||||||
then
|
then
|
||||||
echo "OS $os is currently not supported." >&2
|
echo "OS $os is currently not supported." >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -29,6 +29,9 @@ case "$os_version" in
|
||||||
8*)
|
8*)
|
||||||
:
|
:
|
||||||
;;
|
;;
|
||||||
|
jessie*)
|
||||||
|
:
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Unsupported version $os_version of $os." >&2
|
echo "Unsupported version $os_version of $os." >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -38,7 +41,9 @@ esac
|
||||||
db_pass=$(cat "$__object/parameter/db-pass")
|
db_pass=$(cat "$__object/parameter/db-pass")
|
||||||
db_user=$(cat "$__object/parameter/db-user")
|
db_user=$(cat "$__object/parameter/db-user")
|
||||||
db_name=$(cat "$__object/parameter/db-name")
|
db_name=$(cat "$__object/parameter/db-name")
|
||||||
db_name=$(cat "$__object/parameter/domain")
|
domain=$(cat "$__object/parameter/domain")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Hostname
|
# Hostname
|
||||||
__hostname --name "$domain"
|
__hostname --name "$domain"
|
||||||
|
|
Loading…
Reference in a new issue