YunoHost-Apps/freshrss_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/freshrss_ynh.git synced 2024-09-03 18:36:33 +02:00
Code Issues Activity Actions

[enh]Final cleanup for 1.0

Browse source
This commit is contained in:
Clément 2015-02-10 17:50:30 +01:00
parent 6a24273a7d
commit 4b2c551186
2 changed files with 0 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
conf/dist_user.conf
View file

@ -1,62 +0,0 @@
<?php
return array (
'language' => 'en',
'old_entries' => 3,
'keep_history_default' => 0,
'ttl_default' => 3600,
'mail_login' => '',
'token' => '',
'passwordHash' => '',
'apiPasswordHash' => '',
'posts_per_page' => 20,
'view_mode' => 'normal',
'default_view' => 2,
'auto_load_more' => true,
'display_posts' => true,
'onread_jump_next' => true,
'lazyload' => true,
'sticky_post' => true,
'reading_confirm' => false,
'sort_order' => 'DESC',
'anon_access' => false,
'mark_when' =>
array (
'article' => true,
'site' => true,
'scroll' => false,
'reception' => false,
),
'theme' => 'Flat',
'content_width' => 'thin',
'shortcuts' =>
array (
'mark_read' => 'r',
'mark_favorite' => 'f',
'go_website' => 'space',
'next_entry' => 'n',
'prev_entry' => 'k',
'first_entry' => 'home',
'last_entry' => 'end',
'collapse_entry' => 'c',
'load_more' => 'm',
'auto_share' => 's',
'focus_search' => 'a',
),
'topline_read' => true,
'topline_favorite' => true,
'topline_date' => true,
'topline_link' => true,
'bottomline_read' => true,
'bottomline_favorite' => true,
'bottomline_sharing' => true,
'bottomline_tags' => true,
'bottomline_date' => true,
'bottomline_link' => true,
'sharing' =>
array (sharingArrayYnh),
'queries' =>
array (
),
'html5_notif_timeout' => 0,
'user' => 'YnoUser',
);

6
scripts/install
View file

@ -58,7 +58,6 @@ if [[ $(sudo yunohost app list -f wallabag | /bin/grep -q "installed: True") -eq
echo "Detected wallabag" echo "Detected wallabag"
wallabagPath=$(sudo yunohost app setting wallabag path) wallabagPath=$(sudo yunohost app setting wallabag path)
wallabagUrl=$domain$wallabagPath wallabagUrl=$domain$wallabagPath
# sharingWallabag="'sharing' => array( 0 => array('type' => 'wallabag','name' => 'Wallabag','url' => 'https://$wallabagUrl',),"
sharingWallabag="'sharing' => \n\tarray( \n\t\t0 => \n\t\tarray(\n\t\t\t'type' => 'wallabag',\n\t\t\t'name' => 'Wallabag',\n\t\t\t'url' => 'https://$wallabagUrl',\n\t\t)," sharingWallabag="'sharing' => \n\tarray( \n\t\t0 => \n\t\tarray(\n\t\t\t'type' => 'wallabag',\n\t\t\t'name' => 'Wallabag',\n\t\t\t'url' => 'https://$wallabagUrl',\n\t\t),"
sharingEnable=1 sharingEnable=1
fi fi
@ -74,9 +73,7 @@ do
mysql -u $db_user -p$db_pwd $db_user < /tmp/$myuser-install.sql mysql -u $db_user -p$db_pwd $db_user < /tmp/$myuser-install.sql
#remove temp sql #remove temp sql
sudo rm /tmp/$myuser-install.sql sudo rm /tmp/$myuser-install.sql
#sudo mkdir $final_path/data/users/$myuser/
#copy default conf #copy default conf
#sudo cp ../conf/dist_user.conf $final_path/data/users/$myuser/config.php
sudo cp -r $final_path/data/users/_/ $final_path/data/users/$myuser sudo cp -r $final_path/data/users/_/ $final_path/data/users/$myuser
sudo mv $final_path/data/users/$myuser/config.default.php $final_path/data/users/$myuser/config.php sudo mv $final_path/data/users/$myuser/config.default.php $final_path/data/users/$myuser/config.php
@ -84,9 +81,6 @@ do
sudo sed -i "s@'sharing'\ =>\ array\ (@$sharingWallabag@g" $final_path/data/users/$myuser/config.php sudo sed -i "s@'sharing'\ =>\ array\ (@$sharingWallabag@g" $final_path/data/users/$myuser/config.php
fi fi
done done
#copy defaut user conf for futur users
sudo cp ../conf/dist_user.conf $final_path/data/user.php.dist
# Delete install directive # Delete install directive
sudo rm $final_path/data/do-install.txt sudo rm $final_path/data/do-install.txt