cloudron
/
freshrss-app
mirror of https://git.cloudron.io/cloudron/freshrss-app
1
0
Fork 0
Code Issues Releases Wiki Activity

remove ttrss patch (plugin has not been updated in years)

This commit is contained in:
Girish Ramakrishnan 2018-05-30 14:50:28 -07:00
parent ef2dcdc51e
commit 28ae86b5f8
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -18,11 +18,9 @@ RUN mv data data-orig && ln -s /app/data data
# official extensions
ADD change-ttrss-file-path.patch /app/code/change-ttrss-file-path.patch
RUN wget https://github.com/FreshRSS/Extensions/archive/${EXTENSIONS_VERSION}.tar.gz -O - \
| tar -xz --strip-components=1 -C /app/code/extensions \
&& patch -p0 -d /app/code < /app/code/change-ttrss-file-path.patch \
| tar -xz --strip-components=1 -C /app/code/extensions
&& mv /app/code/extensions /app/code/extensions-orig \
&& ln -s /app/data/extensions /app/code/extensions \
&& ln -s /app/data/extensions/ttrss.php /app/code/p/api/ttrss.php
&& ln -s /app/data/extensions /app/code/extensions
# configure apache
RUN rm /etc/apache2/sites-enabled/*

21
change-ttrss-file-path.patch
View File

@ -1,21 +0,0 @@
diff -ru extensions-orig/xExtension-TTRSS_API/extension.php extensions/xExtension-TTRSS_API/extension.php
--- extensions-orig/xExtension-TTRSS_API/extension.php 2016-12-15 10:24:17.000000000 +0000
+++ extensions/xExtension-TTRSS_API/extension.php 2017-02-18 13:06:59.640761922 +0000
@@ -9,7 +9,7 @@
public function install() {
$filename = 'ttrss.php';
$file_source = join_path($this->getPath(), $filename);
- $path_destination = join_path(PUBLIC_PATH, 'api');
+ $path_destination = '/app/data/extensions';
$file_destination = join_path($path_destination, $filename);
if (!is_writable($path_destination)) {
@@ -35,7 +35,7 @@
public function uninstall() {
$filename = 'ttrss.php';
- $file_destination = join_path(PUBLIC_PATH, 'api', $filename);
+ $file_destination = join_path('/app/data/extensions', $filename);
if (file_exists($file_destination) && !unlink($file_destination)) {
return 'API file cannot be removed';