Commit 538aac04e752e779277ce90e9b473c08ab767963

Authored by Alexis Gavoty
1 parent a293d369cc
Exists in master

[fix] Properly check YunoHost users

Showing 1 changed file with 3 additions and 2 deletions Inline Diff

1 #!/bin/bash 1 #!/bin/bash
2 2
3 # Retrieve arguments 3 # Retrieve arguments
4 domain=$1 4 domain=$1
5 path=$2 5 path=$2
6 user=$3 6 user=$3
7 7
8 # Check user parameter 8 # Check user parameter
9 ls /home | grep $user 9 sudo yunohost user list --json | grep -q '"id": "$user"'
10 if [[ ! $? -eq 0 ]]; then 10 if [[ ! $? -eq 0 ]]; then
11 echo "Wrong user" 11 echo "Wrong user"
12 exit 1 12 exit 1
13 fi 13 fi
14 sudo yunohost app setting owncloud admin_user -v $user 14 sudo yunohost app setting owncloud admin_user -v $user
15 15
16 # Check domain/path availability 16 # Check domain/path availability
17 sudo yunohost app checkurl $domain$path -a owncloud 17 sudo yunohost app checkurl $domain$path -a owncloud
18 if [[ ! $? -eq 0 ]]; then 18 if [[ ! $? -eq 0 ]]; then
19 exit 1 19 exit 1
20 fi 20 fi
21 21
22 # Install dependencies 22 # Install dependencies
23 sudo apt-get install acl smbclient -y -qq 23 sudo apt-get install acl smbclient -y -qq
24 24
25 # Generate random password 25 # Generate random password
26 db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p') 26 db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p')
27 27
28 # Use 'owncloud' as database name and user 28 # Use 'owncloud' as database name and user
29 db_user=owncloud 29 db_user=owncloud
30 30
31 # Initialize database and store mysql password for upgrade 31 # Initialize database and store mysql password for upgrade
32 sudo yunohost app initdb $db_user -p $db_pwd 32 sudo yunohost app initdb $db_user -p $db_pwd
33 sudo yunohost app setting owncloud mysqlpwd -v $db_pwd 33 sudo yunohost app setting owncloud mysqlpwd -v $db_pwd
34 34
35 # Create owncloud user 35 # Create owncloud user
36 sudo useradd -d /var/www/owncloud owncloud 36 sudo useradd -d /var/www/owncloud owncloud
37 37
38 # Copy files to the right place 38 # Copy files to the right place
39 final_path=/var/www/owncloud 39 final_path=/var/www/owncloud
40 data_path=/home/yunohost.app/owncloud/data 40 data_path=/home/yunohost.app/owncloud/data
41 sudo mkdir -p $final_path 41 sudo mkdir -p $final_path
42 sudo mkdir -p $data_path 42 sudo mkdir -p $data_path
43 sudo cp -a ../sources/* $final_path 43 sudo cp -a ../sources/* $final_path
44 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/owncloud.conf 44 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/owncloud.conf
45 sudo cp ../conf/php-fpm.conf /etc/php5/fpm/pool.d/owncloud.conf 45 sudo cp ../conf/php-fpm.conf /etc/php5/fpm/pool.d/owncloud.conf
46 sudo cp ../conf/php-fpm.ini /etc/php5/fpm/conf.d/20-owncloud.ini 46 sudo cp ../conf/php-fpm.ini /etc/php5/fpm/conf.d/20-owncloud.ini
47 sudo cp ../conf/mount.json $data_path 47 sudo cp ../conf/mount.json $data_path
48 sudo chown -hR owncloud:www-data $final_path 48 sudo chown -hR owncloud:www-data $final_path
49 sudo chown -hR owncloud:www-data $data_path 49 sudo chown -hR owncloud:www-data $data_path
50 sudo chown owncloud:www-data /home/yunohost.app/owncloud 50 sudo chown owncloud:www-data /home/yunohost.app/owncloud
51 sudo chmod 755 /home/yunohost.app 51 sudo chmod 755 /home/yunohost.app
52 sudo chmod -R 775 $final_path 52 sudo chmod -R 775 $final_path
53 sudo chmod -R 770 $data_path 53 sudo chmod -R 770 $data_path
54 54
55 # Change variables in Owncloud configuration 55 # Change variables in Owncloud configuration
56 sudo sed -i "s@PATHTOCHANGE@$path@g" /etc/nginx/conf.d/$domain.d/owncloud.conf 56 sudo sed -i "s@PATHTOCHANGE@$path@g" /etc/nginx/conf.d/$domain.d/owncloud.conf
57 sudo sed -i "s@ALIASTOCHANGE@$final_path/@g" /etc/nginx/conf.d/$domain.d/owncloud.conf 57 sudo sed -i "s@ALIASTOCHANGE@$final_path/@g" /etc/nginx/conf.d/$domain.d/owncloud.conf
58 sudo sed -i "s@NAMETOCHANGE@owncloud@g" /etc/nginx/conf.d/$domain.d/owncloud.conf 58 sudo sed -i "s@NAMETOCHANGE@owncloud@g" /etc/nginx/conf.d/$domain.d/owncloud.conf
59 sudo sed -i "s@NAMETOCHANGE@owncloud@g" /etc/php5/fpm/pool.d/owncloud.conf 59 sudo sed -i "s@NAMETOCHANGE@owncloud@g" /etc/php5/fpm/pool.d/owncloud.conf
60 60
61 # Set permissions to owncloud directories and /home directories + add Home external storage 61 # Set permissions to owncloud directories and /home directories + add Home external storage
62 for i in $(ls /home) 62 for i in $(ls /home)
63 do 63 do
64 if [[ ! $i == yunohost.* ]]; 64 sudo yunohost user list --json | grep -q '"id": "$i"'
65 if [[ $? -eq 0 ]];
65 then 66 then
66 sudo setfacl -m g:owncloud:rwx /home/$i 67 sudo setfacl -m g:owncloud:rwx /home/$i
67 sudo mkdir $data_path/$i 68 sudo mkdir $data_path/$i
68 fi 69 fi
69 done 70 done
70 71
71 # Reload Nginx and regenerate SSOwat conf 72 # Reload Nginx and regenerate SSOwat conf
72 sudo service php5-fpm restart 73 sudo service php5-fpm restart
73 sudo service nginx reload 74 sudo service nginx reload
74 sudo yunohost app setting owncloud skipped_uris -v "/" 75 sudo yunohost app setting owncloud skipped_uris -v "/"
75 sudo yunohost app ssowatconf 76 sudo yunohost app ssowatconf
76 77
77 # Owncloud installation via curl 78 # Owncloud installation via curl
78 echo "127.0.0.1 $domain #yunoowncloud" | sudo tee -a /etc/hosts 79 echo "127.0.0.1 $domain #yunoowncloud" | sudo tee -a /etc/hosts
79 sleep 1 80 sleep 1
80 curl -kL -X POST https://$domain$path/index.php --data "install=true&adminlogin=admin&adminpass=$db_pwd&directory=/home/yunohost.app/owncloud/data&dbtype=mysql&dbuser=$db_user&dbpass=$db_pwd&dbname=$db_user&dbhost=localhost" > /dev/null 2>&1 81 curl -kL -X POST https://$domain$path/index.php --data "install=true&adminlogin=admin&adminpass=$db_pwd&directory=/home/yunohost.app/owncloud/data&dbtype=mysql&dbuser=$db_user&dbpass=$db_pwd&dbname=$db_user&dbhost=localhost" > /dev/null 2>&1
81 82
82 # Enable plugins 83 # Enable plugins
83 sleep 5 84 sleep 5
84 curl -kL -X POST https://$domain$path/index.php/settings/ajax/enableapp.php --data "appid=files_external" -u "admin:$db_pwd" > /dev/null 2>&1 85 curl -kL -X POST https://$domain$path/index.php/settings/ajax/enableapp.php --data "appid=files_external" -u "admin:$db_pwd" > /dev/null 2>&1
85 curl -kL -X POST https://$domain$path/index.php/settings/ajax/enableapp.php --data "appid=user_ldap" -u "admin:$db_pwd" > /dev/null 2>&1 86 curl -kL -X POST https://$domain$path/index.php/settings/ajax/enableapp.php --data "appid=user_ldap" -u "admin:$db_pwd" > /dev/null 2>&1
86 87
87 # Check if the Mysql database is initialized & running 88 # Check if the Mysql database is initialized & running
88 mysql -u $db_user -p$db_pwd $db_user -e "select * from oc_appconfig;" > /dev/null 2>&1 89 mysql -u $db_user -p$db_pwd $db_user -e "select * from oc_appconfig;" > /dev/null 2>&1
89 result=$? 90 result=$?
90 loop_number=1 91 loop_number=1
91 while [ $result != 0 ] && [ $loop_number -lt 5 ]; 92 while [ $result != 0 ] && [ $loop_number -lt 5 ];
92 do 93 do
93 sleep 5 94 sleep 5
94 mysql -u $db_user -p$db_pwd $db_user -e "select * from oc_appconfig;" > /dev/null 2>&1 95 mysql -u $db_user -p$db_pwd $db_user -e "select * from oc_appconfig;" > /dev/null 2>&1
95 let result=$? 96 let result=$?
96 if [ $loop_number -eq 4 ]; 97 if [ $loop_number -eq 4 ];
97 then 98 then
98 print "Web installation failed" 99 print "Web installation failed"
99 exit 1 100 exit 1
100 fi 101 fi
101 let loop_number++ 102 let loop_number++
102 done 103 done
103 104
104 # Configure LDAP plugin 105 # Configure LDAP plugin
105 mysql -u $db_user -p$db_pwd $db_user < ../conf/ldap_config.sql 106 mysql -u $db_user -p$db_pwd $db_user < ../conf/ldap_config.sql
106 107
107 sudo chown -hR owncloud:owncloud $final_path 108 sudo chown -hR owncloud:owncloud $final_path
108 sudo chown -hR owncloud:owncloud $data_path 109 sudo chown -hR owncloud:owncloud $data_path
109 sudo chmod 755 /home/yunohost.app 110 sudo chmod 755 /home/yunohost.app
110 sudo chmod -R 775 $final_path 111 sudo chmod -R 775 $final_path
111 sudo chmod -R 770 $data_path 112 sudo chmod -R 770 $data_path
112 113
113 # Make an LDAP user as admin 114 # Make an LDAP user as admin
114 mysql -u $db_user -p$db_pwd $db_user -e "INSERT INTO oc_group_user VALUES ('admin','$user');" 115 mysql -u $db_user -p$db_pwd $db_user -e "INSERT INTO oc_group_user VALUES ('admin','$user');"
115 116
116 # Unprotect URIs 117 # Unprotect URIs
117 sudo yunohost app setting owncloud skipped_uris -v "/public.php,/core,/apps/files,/index.php/apps/files" 118 sudo yunohost app setting owncloud skipped_uris -v "/public.php,/core,/apps/files,/index.php/apps/files"
118 sudo yunohost app setting owncloud unprotected_uris -v "/remote.php,/cron.php,/status.php" 119 sudo yunohost app setting owncloud unprotected_uris -v "/remote.php,/cron.php,/status.php"
119 sudo yunohost app ssowatconf 120 sudo yunohost app ssowatconf
120 121
121 # Remove temporary entry in /etc/hosts 122 # Remove temporary entry in /etc/hosts
122 sudo sed -i '/yunoowncloud/d' /etc/hosts 123 sudo sed -i '/yunoowncloud/d' /etc/hosts
123 124