ungleich-public/__ungleich_nextcloud
6
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Bugfixes:

Browse source 
- Manifest had some duplicated code
- Manifest set the wrong distribution variable for the repository
- Gencode-remote is still hacky, but works for the moment
This commit is contained in:
Dominique Roux 2018-07-13 18:15:36 +02:00
parent f3246b99c4
commit 50bfdd43a2
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gencode-remote
View file

@ -45,13 +45,15 @@ admin_pass=$(cat "$__object/parameter/admin-pass")
domain=$(cat "$__object/parameter/domain") domain=$(cat "$__object/parameter/domain")
# TODO check shasum of tar ball # TODO check shasum of tar ball
if [ -d /var/www/nextcloud -a \$(cd /var/www/nextcloud; sudo -u www-data php occ status | grep -o true) ]; then # TODO: Make this Work!!
INSTALL_STATE=true #if [ -d /var/www/nextcloud -a \$(cd /var/www/nextcloud; sudo -u www-data php occ status | grep -o true) ]; then
else # INSTALL_STATE=true
INSTALL_STATE=false #else
fi # INSTALL_STATE=false
echo \${INSTALL_STATE} > /tmp/install-state #fi
if [ "\$INSTALL_STATE" != "true" ]; then #echo \${INSTALL_STATE} > /tmp/install-state
#if [ "\$INSTALL_STATE" != "true" ]; then
cat <<eof
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
rm -f /tmp/nextcloud.tar.bz2 rm -f /tmp/nextcloud.tar.bz2
@ -59,5 +61,5 @@ if [ "\$INSTALL_STATE" != "true" ]; then
cd /var/www/nextcloud cd /var/www/nextcloud
sudo -u www-data php occ maintenance:install --database "pgsql" --database-name "$db_name" --database-user "$db_user" --database-pass "$db_pass" --admin-user "$admin_user" --admin-pass "$admin_pass" sudo -u www-data php occ maintenance:install --database "pgsql" --database-name "$db_name" --database-user "$db_user" --database-pass "$db_pass" --admin-user "$admin_user" --admin-pass "$admin_pass"
sudo -u www-data php occ config:system:set trusted_domains 2 --value="$domain" sudo -u www-data php occ config:system:set trusted_domains 2 --value="$domain"
fi
eof eof
#fi

10
manifest
View file

@ -27,12 +27,15 @@ fi
os_version=$(cat "$__global/explorer/os_version") os_version=$(cat "$__global/explorer/os_version")
case "$os_version" in case "$os_version" in
8*) 8*)
distribution="jessie"
: :
;; ;;
9*) 9*)
distribution="stretch"
: :
;; ;;
jessie*) jessie*)
distribution="jessie"
: :
;; ;;
*) *)
@ -51,16 +54,11 @@ domain=$(cat "$__object/parameter/domain")
__apt_key_uri dotdeb --uri https://www.dotdeb.org/dotdeb.gpg __apt_key_uri dotdeb --uri https://www.dotdeb.org/dotdeb.gpg
require="__apt_key_uri/dotdeb" __apt_source dotdeb --uri http://packages.dotdeb.org \ require="__apt_key_uri/dotdeb" __apt_source dotdeb --uri http://packages.dotdeb.org \
--distribution jessie \ --distribution ${distribution} \
--component all --component all
require="__apt_source/dotdeb" __apt_update_index require="__apt_source/dotdeb" __apt_update_index
__apt_key_uri dotdeb --uri https://www.dotdeb.org/dotdeb.gpg
require="__apt_key_uri/dotdeb" __apt_source dotdeb --uri http://packages.dotdeb.org \
--distribution jessie \
--component all
# Install packages # Install packages
for package in php7.0-common php7.0-gd php7.0-json php7.0-pgsql php7.0-curl \ for package in php7.0-common php7.0-gd php7.0-json php7.0-pgsql php7.0-curl \
php7.0-intl php7.0-mcrypt php7.0-imagick \ php7.0-intl php7.0-mcrypt php7.0-imagick \