ecommun / owncloud_ynh

Download as
Browse Code ยป

Commit eca7c47c39ab96eecf4290dcdb32f3d6f0311c17

Authored by Alexis Gavoty
2 parents cfffda1d39 008a8223bd
Exists in master

Merge pull request #11 from zamentur/patch-1 

Fix gallery app for non connected user

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