Compare commits
No commits in common. "main" and "v1.18.1-1" have entirely different histories.
|
@ -6,9 +6,13 @@
|
|||
{{ range .CommitGroups -}}
|
||||
### {{ .Title }}
|
||||
|
||||
{{ $subjects := list }}
|
||||
{{ range .Commits -}}
|
||||
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ (regexReplaceAll "(.*)/issues/(.*)" (regexReplaceAll "(Co-\\w*-by.*)" .Subject "") "${1}/pulls/${2}") | trim }}
|
||||
{{ if not (has .Subject $subjects) -}}
|
||||
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
|
||||
{{ $subjects = append $subjects .Subject -}}
|
||||
{{ end }}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
|
||||
{{- if .NoteGroups -}}
|
||||
|
|
297
.drone.yml
297
.drone.yml
|
@ -7,16 +7,16 @@ platform:
|
|||
arch: amd64
|
||||
|
||||
steps:
|
||||
- name: markdownlint
|
||||
image: thegeeklab/markdownlint-cli
|
||||
commands:
|
||||
- markdownlint 'README.md'
|
||||
- name: markdownlint
|
||||
image: thegeeklab/markdownlint-cli
|
||||
commands:
|
||||
- markdownlint 'README.md'
|
||||
|
||||
trigger:
|
||||
ref:
|
||||
- refs/heads/main
|
||||
- refs/pull/**
|
||||
- refs/tags/**
|
||||
- refs/heads/main
|
||||
- refs/pull/**
|
||||
- refs/tags/**
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
|
@ -27,106 +27,113 @@ platform:
|
|||
arch: amd64
|
||||
|
||||
steps:
|
||||
- name: dryrun
|
||||
image: thegeeklab/drone-docker-buildx:23
|
||||
settings:
|
||||
dockerfile: Dockerfile
|
||||
dry_run: true
|
||||
provenance: false
|
||||
repo: thegeeklab/${DRONE_REPO_NAME}
|
||||
when:
|
||||
ref:
|
||||
- refs/pull/**
|
||||
- name: dryrun
|
||||
image: thegeeklab/drone-docker-buildx:20
|
||||
settings:
|
||||
build_args:
|
||||
- BUILD_VERSION=${DRONE_TAG%-*}
|
||||
dockerfile: Dockerfile
|
||||
dry_run: true
|
||||
password:
|
||||
from_secret: docker_password
|
||||
repo: thegeeklab/${DRONE_REPO_NAME}
|
||||
username:
|
||||
from_secret: docker_username
|
||||
when:
|
||||
ref:
|
||||
- refs/pull/**
|
||||
|
||||
- name: tags
|
||||
image: thegeeklab/docker-autotag
|
||||
environment:
|
||||
DOCKER_AUTOTAG_FORCE_LATEST: True
|
||||
DOCKER_AUTOTAG_IGNORE_PRERELEASE: True
|
||||
DOCKER_AUTOTAG_OUTPUT_FILE: .tags
|
||||
DOCKER_AUTOTAG_VERSION: ${DRONE_TAG}
|
||||
when:
|
||||
ref:
|
||||
- refs/heads/main
|
||||
- refs/tags/**
|
||||
depends_on:
|
||||
- dryrun
|
||||
- name: tags
|
||||
image: thegeeklab/docker-autotag
|
||||
environment:
|
||||
DOCKER_AUTOTAG_FORCE_LATEST: True
|
||||
DOCKER_AUTOTAG_IGNORE_PRERELEASE: True
|
||||
DOCKER_AUTOTAG_OUTPUT_FILE: .tags
|
||||
DOCKER_AUTOTAG_VERSION: ${DRONE_TAG}
|
||||
when:
|
||||
ref:
|
||||
- refs/heads/main
|
||||
- refs/tags/**
|
||||
depends_on:
|
||||
- dryrun
|
||||
|
||||
- name: changelog-generate
|
||||
image: thegeeklab/git-chglog
|
||||
commands:
|
||||
- git fetch -tq
|
||||
- git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}
|
||||
depends_on:
|
||||
- tags
|
||||
- name: changelog-generate
|
||||
image: thegeeklab/git-chglog
|
||||
commands:
|
||||
- git fetch -tq
|
||||
- git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}
|
||||
depends_on:
|
||||
- tags
|
||||
|
||||
- name: changelog-format
|
||||
image: thegeeklab/alpine-tools
|
||||
commands:
|
||||
- prettier CHANGELOG.md
|
||||
- prettier -w CHANGELOG.md
|
||||
depends_on:
|
||||
- changelog-generate
|
||||
- name: changelog-format
|
||||
image: thegeeklab/alpine-tools
|
||||
commands:
|
||||
- prettier CHANGELOG.md
|
||||
- prettier -w CHANGELOG.md
|
||||
depends_on:
|
||||
- changelog-generate
|
||||
|
||||
- name: publish-dockerhub
|
||||
image: thegeeklab/drone-docker-buildx:23
|
||||
settings:
|
||||
dockerfile: Dockerfile
|
||||
password:
|
||||
from_secret: docker_password
|
||||
provenance: false
|
||||
repo: thegeeklab/${DRONE_REPO_NAME}
|
||||
username:
|
||||
from_secret: docker_username
|
||||
when:
|
||||
ref:
|
||||
- refs/heads/main
|
||||
- refs/tags/**
|
||||
depends_on:
|
||||
- changelog-format
|
||||
- name: publish-dockerhub
|
||||
image: thegeeklab/drone-docker-buildx:20
|
||||
settings:
|
||||
build_args:
|
||||
- BUILD_VERSION=${DRONE_TAG%-*}
|
||||
dockerfile: Dockerfile
|
||||
password:
|
||||
from_secret: docker_password
|
||||
repo: thegeeklab/${DRONE_REPO_NAME}
|
||||
username:
|
||||
from_secret: docker_username
|
||||
when:
|
||||
ref:
|
||||
- refs/heads/main
|
||||
- refs/tags/**
|
||||
depends_on:
|
||||
- changelog-format
|
||||
|
||||
- name: publish-quay
|
||||
image: thegeeklab/drone-docker-buildx:23
|
||||
settings:
|
||||
dockerfile: Dockerfile
|
||||
password:
|
||||
from_secret: quay_password
|
||||
provenance: false
|
||||
registry: quay.io
|
||||
repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
|
||||
username:
|
||||
from_secret: quay_username
|
||||
when:
|
||||
ref:
|
||||
- refs/heads/main
|
||||
- refs/tags/**
|
||||
depends_on:
|
||||
- changelog-format
|
||||
- name: publish-quay
|
||||
image: thegeeklab/drone-docker-buildx:20
|
||||
settings:
|
||||
build_args:
|
||||
- BUILD_VERSION=${DRONE_TAG%-*}
|
||||
dockerfile: Dockerfile
|
||||
password:
|
||||
from_secret: quay_password
|
||||
registry: quay.io
|
||||
repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
|
||||
username:
|
||||
from_secret: quay_username
|
||||
when:
|
||||
ref:
|
||||
- refs/heads/main
|
||||
- refs/tags/**
|
||||
depends_on:
|
||||
- changelog-format
|
||||
|
||||
- name: publish-gitea
|
||||
image: plugins/gitea-release
|
||||
settings:
|
||||
api_key:
|
||||
from_secret: gitea_token
|
||||
base_url: https://gitea.rknet.org
|
||||
note: CHANGELOG.md
|
||||
overwrite: true
|
||||
title: ${DRONE_TAG}
|
||||
when:
|
||||
ref:
|
||||
- refs/tags/**
|
||||
depends_on:
|
||||
- publish-dockerhub
|
||||
- publish-quay
|
||||
- name: publish-gitea
|
||||
image: plugins/gitea-release
|
||||
settings:
|
||||
api_key:
|
||||
from_secret: gitea_token
|
||||
base_url: https://gitea.rknet.org
|
||||
note: CHANGELOG.md
|
||||
overwrite: true
|
||||
title: ${DRONE_TAG}
|
||||
when:
|
||||
ref:
|
||||
- refs/tags/**
|
||||
depends_on:
|
||||
- publish-dockerhub
|
||||
- publish-quay
|
||||
|
||||
trigger:
|
||||
ref:
|
||||
- refs/heads/main
|
||||
- refs/pull/**
|
||||
- refs/tags/**
|
||||
- refs/heads/main
|
||||
- refs/pull/**
|
||||
- refs/tags/**
|
||||
|
||||
depends_on:
|
||||
- test
|
||||
- test
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
|
@ -137,63 +144,63 @@ platform:
|
|||
arch: amd64
|
||||
|
||||
steps:
|
||||
- name: pushrm-dockerhub
|
||||
pull: always
|
||||
image: chko/docker-pushrm:1
|
||||
environment:
|
||||
DOCKER_PASS:
|
||||
from_secret: docker_password
|
||||
DOCKER_USER:
|
||||
from_secret: docker_username
|
||||
PUSHRM_FILE: README.md
|
||||
PUSHRM_SHORT: Custom image for FreshRSS feed aggregator
|
||||
PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME}
|
||||
when:
|
||||
status:
|
||||
- success
|
||||
- name: pushrm-dockerhub
|
||||
pull: always
|
||||
image: chko/docker-pushrm:1
|
||||
environment:
|
||||
DOCKER_PASS:
|
||||
from_secret: docker_password
|
||||
DOCKER_USER:
|
||||
from_secret: docker_username
|
||||
PUSHRM_FILE: README.md
|
||||
PUSHRM_SHORT: Custom image for FreshRSS feed aggregator
|
||||
PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME}
|
||||
when:
|
||||
status:
|
||||
- success
|
||||
|
||||
- name: pushrm-quay
|
||||
pull: always
|
||||
image: chko/docker-pushrm:1
|
||||
environment:
|
||||
APIKEY__QUAY_IO:
|
||||
from_secret: quay_token
|
||||
PUSHRM_FILE: README.md
|
||||
PUSHRM_TARGET: quay.io/thegeeklab/${DRONE_REPO_NAME}
|
||||
when:
|
||||
status:
|
||||
- success
|
||||
- name: pushrm-quay
|
||||
pull: always
|
||||
image: chko/docker-pushrm:1
|
||||
environment:
|
||||
APIKEY__QUAY_IO:
|
||||
from_secret: quay_token
|
||||
PUSHRM_FILE: README.md
|
||||
PUSHRM_TARGET: quay.io/thegeeklab/${DRONE_REPO_NAME}
|
||||
when:
|
||||
status:
|
||||
- success
|
||||
|
||||
- name: matrix
|
||||
image: thegeeklab/drone-matrix
|
||||
settings:
|
||||
homeserver:
|
||||
from_secret: matrix_homeserver
|
||||
password:
|
||||
from_secret: matrix_password
|
||||
roomid:
|
||||
from_secret: matrix_roomid
|
||||
template: "Status: **{{ .Build.Status }}**<br/> Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}<br/> Message: {{ .Commit.Message.Title }}"
|
||||
username:
|
||||
from_secret: matrix_username
|
||||
when:
|
||||
status:
|
||||
- success
|
||||
- failure
|
||||
|
||||
trigger:
|
||||
ref:
|
||||
- refs/heads/main
|
||||
- refs/tags/**
|
||||
status:
|
||||
- name: matrix
|
||||
image: plugins/matrix
|
||||
settings:
|
||||
homeserver:
|
||||
from_secret: matrix_homeserver
|
||||
password:
|
||||
from_secret: matrix_password
|
||||
roomid:
|
||||
from_secret: matrix_roomid
|
||||
template: "Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}"
|
||||
username:
|
||||
from_secret: matrix_username
|
||||
when:
|
||||
status:
|
||||
- success
|
||||
- failure
|
||||
|
||||
trigger:
|
||||
ref:
|
||||
- refs/heads/main
|
||||
- refs/tags/**
|
||||
status:
|
||||
- success
|
||||
- failure
|
||||
|
||||
depends_on:
|
||||
- build-container
|
||||
- build-container
|
||||
|
||||
---
|
||||
kind: signature
|
||||
hmac: cba07850e21c648f8558e69aa7e5a561ef473fe2a3a7890bf308a57c73ea0343
|
||||
hmac: b4bc5725b81af54f315d93f84f7c1097d02f5258277fc09e87d42029ed9539a0
|
||||
|
||||
...
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
.drone.yml
|
||||
*.tpl.md
|
||||
LICENSE
|
||||
|
|
22
Dockerfile
22
Dockerfile
|
@ -1,4 +1,4 @@
|
|||
FROM thegeeklab/nginx:latest@sha256:72ffd57b6b89013f6b4c6a8a97728120df1dfac0d66b2164e0aacba21ee87380
|
||||
FROM thegeeklab/nginx:latest@sha256:b87952e51d7e29439a23affa33301b82aede3c4c4a59a3ac1273b47f1fba6195
|
||||
|
||||
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
|
||||
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
|
||||
|
@ -8,26 +8,25 @@ LABEL org.opencontainers.image.source="https://gitea.rknet.org/docker/freshrss"
|
|||
LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/freshrss"
|
||||
|
||||
ARG BUILD_VERSION
|
||||
|
||||
# renovate: datasource=github-releases depName=FreshRSS/FreshRSS
|
||||
ENV FRESHRSS_VERSION="${BUILD_VERSION:-1.21.0}"
|
||||
ENV FRESHRSS_VERSION="${BUILD_VERSION:-1.18.1}"
|
||||
|
||||
ADD overlay/ /
|
||||
|
||||
RUN apk --update add --virtual .build-deps tar curl && \
|
||||
apk --update add php81 php81-curl php81-fpm php81-gmp php81-intl php81-mbstring php81-xml \
|
||||
php81-zip php81-ctype php81-dom php81-fileinfo php81-iconv php81-json php81-opcache php81-phar \
|
||||
php81-session php81-simplexml php81-xmlreader php81-xmlwriter php81-tokenizer php81-zlib \
|
||||
php81-openssl php81-pdo_sqlite php81-pdo_mysql php81-pdo_pgsql && \
|
||||
apk --update add php7 php7-curl php7-fpm php7-gmp php7-intl php7-mbstring php7-xml \
|
||||
php7-zip php7-ctype php7-dom php7-fileinfo php7-iconv php7-json php7-session \
|
||||
php7-simplexml php7-xmlreader php7-zlib php7-pdo_sqlite php7-pdo_mysql\
|
||||
php7-pdo_pgsql && \
|
||||
rm -rf /var/www/localhost && \
|
||||
rm -f /etc/php81/php-fpm.d/www.conf && \
|
||||
rm -f /etc/php7/php-fpm.d/www.conf && \
|
||||
mkdir -p /var/www/app && \
|
||||
mkdir /var/www/.postgresql && \
|
||||
FRESHRSS_VERSION="${FRESHRSS_VERSION##v}" && \
|
||||
echo "Installing FreshRSS version '${FRESHRSS_VERSION}' ..." && \
|
||||
curl -SsfL "https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION}.tar.gz" | \
|
||||
curl -SsL "https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION}.tar.gz" | \
|
||||
tar xz -C /var/www/app/ -X /.tarignore --strip-components=1 && \
|
||||
curl -SsfL -o /etc/php81/browscap.ini https://browscap.org/stream?q=Lite_PHP_BrowsCapINI && \
|
||||
curl -SsL -o /etc/php7/browscap.ini https://browscap.org/stream?q=Lite_PHP_BrowsCapINI && \
|
||||
apk del .build-deps && \
|
||||
rm -rf /var/cache/apk/* && \
|
||||
rm -rf /tmp/* && \
|
||||
|
@ -37,7 +36,7 @@ RUN apk --update add --virtual .build-deps tar curl && \
|
|||
mkdir -p /var/lib/php/soap_cache && \
|
||||
mkdir -p /var/lib/php/session && \
|
||||
chown -R nginx /var/lib/php && \
|
||||
chown nginx /etc/php81/php.ini && \
|
||||
chown nginx /etc/php7/php.ini && \
|
||||
chown -R nginx:nginx /var/www/.postgresql && \
|
||||
chown -R nginx:nginx /var/www/app
|
||||
|
||||
|
@ -51,5 +50,6 @@ USER nginx
|
|||
STOPSIGNAL SIGTERM
|
||||
|
||||
ENTRYPOINT ["/usr/local/bin/entrypoint"]
|
||||
HEALTHCHECK --interval=30s --timeout=5s --retries=3 CMD /usr/local/bin/healthcheck
|
||||
WORKDIR /var/www/app
|
||||
CMD []
|
||||
|
|
2
LICENSE
2
LICENSE
|
@ -1,6 +1,6 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) 2022 Robert Kaussow <mail@thegeeklab.de>
|
||||
Copyright (c) 2021 Robert Kaussow <mail@thegeeklab.de>
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
|
@ -48,6 +48,7 @@ FRESHRSS_BASE_URL="http://localhost/"
|
|||
FRESHRSS_LANGUAGE="en"
|
||||
FRESHRSS_TITLE="FreshRSS"
|
||||
FRESHRSS_META_DESCRIPTION=
|
||||
FRESHRSS_DEFAULT_USER="_"
|
||||
FRESHRSS_ALLOW_ANONYMOUS="false"
|
||||
FRESHRSS_ALLOW_ANONYMOUS_REFRESH="false"
|
||||
FRESHRSS_AUTH_TYPE="form"
|
||||
|
@ -79,8 +80,6 @@ FRESHRSS_DB_BASE=
|
|||
FRESHRSS_DB_PREFIX="freshrss_"
|
||||
## comma-seperated string, extensions must be installed!
|
||||
FRESHRSS_EXTENSIONS_ENABLED="Tumblr-GDPR"
|
||||
## comma-seperated string
|
||||
FRESHRSS_TRUSTED_SOURCES=127.0.0.0/8,::1/128
|
||||
```
|
||||
|
||||
### PHP
|
||||
|
|
|
@ -7,16 +7,16 @@ return array(
|
|||
'language' => '{{ getenv "FRESHRSS_LANGUAGE" "en" }}',
|
||||
'title' => '{{ getenv "FRESHRSS_TITLE" "FreshRSS" }}',
|
||||
'meta_description' => '{{ getenv "FRESHRSS_META_DESCRIPTION" }}',
|
||||
'default_user' => '{{ getenv "FRESHRSS_DEFAULT_USER" "admin" }}',
|
||||
'allow_anonymous' => {{ getenv "FRESHRSS_ALLOW_ANONYMOUS" "false" | conv.ToBool }},
|
||||
'allow_anonymous_refresh' => {{ getenv "FRESHRSS_ALLOW_ANONYMOUS_REFRESH" "false" | conv.ToBool }},
|
||||
'default_user' => '{{ getenv "FRESHRSS_DEFAULT_USER" "_" }}',
|
||||
'allow_anonymous' => {{ getenv "FRESHRSS_ALLOW_ANONYMOUS" "false" }},
|
||||
'allow_anonymous_refresh' => {{ getenv "FRESHRSS_ALLOW_ANONYMOUS_REFRESH" "false" }},
|
||||
'auth_type' => '{{ getenv "FRESHRSS_AUTH_TYPE" "form" }}',
|
||||
'api_enabled' => {{ getenv "FRESHRSS_API_ENABLED" "false" | conv.ToBool }},
|
||||
'unsafe_autologin_enabled' => {{ getenv "FRESHRSS_UNSAFE_AUTOLOGIN_ENABLED" "false" | conv.ToBool }},
|
||||
'simplepie_syslog_enabled' => {{ getenv "FRESHRSS_SIMPLEPIE_SYSLOG_ENABLED" "true" | conv.ToBool }},
|
||||
'pubsubhubbub_enabled' => {{ getenv "FRESHRSS_PUBSUBHUBBUB_ENABLED" "false" | conv.ToBool }},
|
||||
'allow_robots' => {{ getenv "FRESHRSS_ALLOW_ROBOTS" "false" | conv.ToBool }},
|
||||
'allow_referrer' => {{ getenv "FRESHRSS_ALLOW_REFERRER" "false" | conv.ToBool }},
|
||||
'api_enabled' => {{ getenv "FRESHRSS_API_ENABLED" "false" }},
|
||||
'unsafe_autologin_enabled' => {{ getenv "FRESHRSS_UNSAFE_AUTOLOGIN_ENABLED" "false" }},
|
||||
'simplepie_syslog_enabled' => {{ getenv "FRESHRSS_SIMPLEPIE_SYSLOG_ENABLED" "true" }},
|
||||
'pubsubhubbub_enabled' => {{ getenv "FRESHRSS_PUBSUBHUBBUB_ENABLED" "false" }},
|
||||
'allow_robots' => {{ getenv "FRESHRSS_ALLOW_ROBOTS" "false" }},
|
||||
'allow_referrer' => {{ getenv "FRESHRSS_ALLOW_REFERRER" "false" }},
|
||||
|
||||
'limits' => array(
|
||||
'cookie_duration' => {{ getenv "FRESHRSS_LIMITS_COOKIE_DURATION" "2592000" }},
|
||||
|
@ -29,25 +29,25 @@ return array(
|
|||
),
|
||||
|
||||
'curl_options' => array(
|
||||
{{- if not (getenv "FRESHRSS_CURLOPT_SSL_VERIFYHOST" "true" | conv.ToBool) }}
|
||||
{{- if not (bool (getenv "FRESHRSS_CURLOPT_SSL_VERIFYHOST" "true")) }}
|
||||
CURLOPT_SSL_VERIFYHOST => {{ getenv "FRESHRSS_CURLOPT_SSL_VERIFYHOST" }},
|
||||
{{- end }}
|
||||
{{- if not (getenv "FRESHRSS_CURLOPT_SSL_VERIFYPEER" "true" | conv.ToBool) }}
|
||||
{{- if not (bool (getenv "FRESHRSS_CURLOPT_SSL_VERIFYPEER" "true")) }}
|
||||
CURLOPT_SSL_VERIFYPEER => {{ getenv "FRESHRSS_CURLOPT_SSL_VERIFYPEER" }},
|
||||
{{- end }}
|
||||
{{- if not (getenv "FRESHRSS_CURLOPT_PROXYTYPE" "true" | conv.ToBool) }}
|
||||
{{- if not (bool (getenv "FRESHRSS_CURLOPT_PROXYTYPE" "true")) }}
|
||||
CURLOPT_PROXYTYPE => {{ getenv "FRESHRSS_CURLOPT_PROXYTYPE" }},
|
||||
{{- end }}
|
||||
{{- if not (getenv "FRESHRSS_CURLOPT_PROXY" "true" | conv.ToBool ) }}
|
||||
{{- if not (bool (getenv "FRESHRSS_CURLOPT_PROXY" "true" )) }}
|
||||
CURLOPT_PROXY => '{{ getenv "FRESHRSS_CURLOPT_PROXY" }}',
|
||||
{{- end }}
|
||||
{{- if not (getenv "FRESHRSS_CURLOPT_PROXYPORT" "true" | conv.ToBool ) }}
|
||||
{{- if not (bool (getenv "FRESHRSS_CURLOPT_PROXYPORT" "true" )) }}
|
||||
CURLOPT_PROXYPORT => {{ getenv "FRESHRSS_CURLOPT_PROXYPORT" }},
|
||||
{{- end }}
|
||||
{{- if not (getenv "FRESHRSS_CURLOPT_PROXYAUTH" "true" | conv.ToBool ) }}
|
||||
{{- if not (bool (getenv "FRESHRSS_CURLOPT_PROXYAUTH" "true" )) }}
|
||||
CURLOPT_PROXYAUTH => {{ getenv "FRESHRSS_CURLOPT_PROXYAUTH" }},
|
||||
{{- end }}
|
||||
{{- if not (getenv "FRESHRSS_CURLOPT_PROXYUSERPWD" "true" | conv.ToBool ) }}
|
||||
{{- if not (bool (getenv "FRESHRSS_CURLOPT_PROXYUSERPWD" "true" )) }}
|
||||
CURLOPT_PROXYUSERPWD => '{{ getenv "FRESHRSS_CURLOPT_PROXYUSERPWD" }}',
|
||||
{{- end }}
|
||||
),
|
||||
|
@ -71,10 +71,4 @@ return array(
|
|||
),
|
||||
|
||||
'disable_update' => true,
|
||||
|
||||
'trusted_sources' => [
|
||||
{{- range (getenv "FRESHRSS_TRUSTED_SOURCES" "127.0.0.0/8,::1/128" | strings.Split ",") }}
|
||||
'{{ . | strings.TrimSpace }}',
|
||||
{{- end }}
|
||||
]
|
||||
);
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
define('FRESHRSS_USERAGENT', 'FreshRSS/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ')');
|
||||
define('PHP_COMPRESSION', false);
|
||||
define('COPY_SYSLOG_TO_STDERR', true);
|
||||
define('MAX_LOG_SIZE', 1048576);
|
||||
define('DATA_PATH', FRESHRSS_PATH . '/data');
|
||||
safe_define('FRESHRSS_USERAGENT', 'FreshRSS/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ')');
|
||||
safe_define('PHP_COMPRESSION', false);
|
||||
safe_define('COPY_SYSLOG_TO_STDERR', true);
|
||||
safe_define('MAX_LOG_SIZE', 1048576);
|
||||
safe_define('DATA_PATH', FRESHRSS_PATH . '/data');
|
||||
|
||||
define('UPDATE_FILENAME', DATA_PATH . '/update.php');
|
||||
define('USERS_PATH', DATA_PATH . '/users');
|
||||
define('ADMIN_LOG', USERS_PATH . '/_/log.txt');
|
||||
define('API_LOG', USERS_PATH . '/_/log_api.txt');
|
||||
define('CACHE_PATH', DATA_PATH . '/cache');
|
||||
define('PSHB_LOG', USERS_PATH . '/_/log_pshb.txt');
|
||||
define('PSHB_PATH', DATA_PATH . '/PubSubHubbub');
|
||||
define('TMP_PATH', CACHE_PATH);
|
||||
safe_define('UPDATE_FILENAME', DATA_PATH . '/update.php');
|
||||
safe_define('USERS_PATH', DATA_PATH . '/users');
|
||||
safe_define('ADMIN_LOG', USERS_PATH . '/_/log.txt');
|
||||
safe_define('API_LOG', USERS_PATH . '/_/log_api.txt');
|
||||
safe_define('CACHE_PATH', DATA_PATH . '/cache');
|
||||
safe_define('PSHB_LOG', USERS_PATH . '/_/log_pshb.txt');
|
||||
safe_define('PSHB_PATH', DATA_PATH . '/PubSubHubbub');
|
||||
safe_define('TMP_PATH', CACHE_PATH);
|
||||
|
|
|
@ -19,9 +19,9 @@ implicit_flush = Off
|
|||
unserialize_callback_func =
|
||||
serialize_precision = 17
|
||||
|
||||
open_basedir = "/var/www/app:/var/lib/php/tmp_upload:/var/lib/php/session:/var/lib/php/soap_cache:/tmp"
|
||||
open_basedir = "/var/www/app:/var/lib/php/tmp_upload:/var/lib/php/session:/var/lib/php/soap_cache"
|
||||
|
||||
disable_functions = system, exec, shell_exec, phpinfo, show_source, highlight_file, popen, proc_open, fopen_with_path, dbmopen, dbase_open, move_uploaded_file, chmod, filepro, filepro_rowcount, filepro_retrieve, posix_mkfifo
|
||||
disable_functions = system, exec, shell_exec, phpinfo, show_source, highlight_file, popen, proc_open, fopen_with_path, dbmopen, dbase_open, move_uploaded_file, chmod, rename, filepro, filepro_rowcount, filepro_retrieve, posix_mkfifo
|
||||
disable_classes =
|
||||
|
||||
;highlight.string = #DD0000
|
||||
|
@ -86,12 +86,12 @@ default_charset = "UTF-8"
|
|||
;input_encoding =
|
||||
;output_encoding =
|
||||
|
||||
;include_path = ".:/php81/includes"
|
||||
;include_path = ".:/php7/includes"
|
||||
|
||||
doc_root =
|
||||
user_dir =
|
||||
|
||||
extension_dir = "/usr/lib/php81/modules"
|
||||
extension_dir = "/usr/lib/php7/modules"
|
||||
;sys_temp_dir = "/tmp"
|
||||
enable_dl = Off
|
||||
|
||||
|
@ -250,7 +250,7 @@ pgsql.log_notice = 0
|
|||
bcmath.scale = 0
|
||||
|
||||
[browscap]
|
||||
browscap = /etc/php81/browscap.ini
|
||||
browscap = /etc/php7/browscap.ini
|
||||
|
||||
[Session]
|
||||
session.save_handler = files
|
||||
|
@ -327,7 +327,7 @@ zend.assertions = -1
|
|||
;exif.decode_jis_intel = JIS
|
||||
|
||||
[Tidy]
|
||||
;tidy.default_config = /usr/local/lib/php81/default.tcfg
|
||||
;tidy.default_config = /usr/local/lib/php7/default.tcfg
|
||||
tidy.clean_output = Off
|
||||
|
||||
[soap]
|
||||
|
|
|
@ -1,61 +1,40 @@
|
|||
#!/usr/bin/env sh
|
||||
|
||||
# shellcheck disable=SC1091
|
||||
. /usr/local/lib/log.sh
|
||||
|
||||
/usr/local/bin/gomplate -o /etc/php81/php.ini -f /etc/templates/php.ini.tmpl
|
||||
/usr/local/bin/gomplate -o /etc/php7/php.ini -f /etc/templates/php.ini.tmpl
|
||||
/usr/local/bin/gomplate -o /var/www/app/data/config.php -f /etc/templates/config.php.tmpl
|
||||
/usr/local/bin/gomplate -o /var/www/app/constants.local.php -f /etc/templates/constants.local.php.tmpl
|
||||
|
||||
if [ -n "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" ] && [ ! -f "/var/www/.postgresql/root.crt" ]; then
|
||||
ln -s "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" /var/www/.postgresql/root.crt
|
||||
fi
|
||||
|
||||
log_info "Prepare FreshRSS"
|
||||
/usr/bin/php -f ./cli/prepare.php >/dev/null 2>&1
|
||||
|
||||
ERROR=$(/usr/bin/php -f ./cli/do-install.php -- --api_enabled \
|
||||
--base_url "${FRESHRSS_BASE_URL:-http://localhost/}" \
|
||||
--db-base "${FRESHRSS_DB_BASE}" \
|
||||
--db-host "${FRESHRSS_DB_HOST:-localhost}" \
|
||||
--db-password "${FRESHRSS_DB_PASSWORD}" \
|
||||
--db-type "${FRESHRSS_DB_TYPE:-sqlite}" \
|
||||
--db-user "${FRESHRSS_DB_USER}" \
|
||||
--default_user "${FRESHRSS_DEFAULT_USER:-admin}" \
|
||||
--language "${FRESHRSS_LANGUAGE:-en}" \
|
||||
2>&1)
|
||||
EXITCODE=$?
|
||||
|
||||
if [ $EXITCODE -eq 3 ]; then
|
||||
log_info "FreshRSS already installed, skipped"
|
||||
elif [ $EXITCODE -eq 0 ]; then
|
||||
log_info "FreshRSS successfully installed"
|
||||
else
|
||||
log_error "FreshRSS error during installation: ${ERROR}"
|
||||
exit $EXITCODE
|
||||
printf "\nPrepare FreshRSS...\n"
|
||||
PREP=$(/usr/bin/php -f ./cli/prepare.php)
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "$PREP"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
log_info "Ensure default user exists"
|
||||
ERROR=$(/usr/bin/php ./cli/create-user.php \
|
||||
--user "${FRESHRSS_DEFAULT_USER:-admin}" \
|
||||
--password "${FRESHRSS_DEFAULT_PASSWORD:-freshrss}" \
|
||||
--language "${FRESHRSS_LANGUAGE:-en}" \
|
||||
2>&1)
|
||||
EXITCODE=$?
|
||||
|
||||
if [ $EXITCODE -eq 3 ]; then
|
||||
log_info "FreshRSS user already exists, skipped"
|
||||
elif [ $EXITCODE -eq 0 ]; then
|
||||
log_info "FreshRSS user successfully created"
|
||||
./cli/list-users.php | xargs -n1 ./cli/actualize-user.php --user "${FRESHRSS_DEFAULT_USER:-admin}"
|
||||
./cli/access-permissions.sh
|
||||
else
|
||||
log_error "FreshRSS error during the creation of a user: ${ERROR}"
|
||||
exit $EXITCODE
|
||||
if [ "${FRESHRSS_DEFAULT_USER}" ]; then
|
||||
printf "\nEnsure default user exists...\n"
|
||||
UCREATE=$(/usr/bin/php ./cli/create-user.php --user "$FRESHRSS_DEFAULT_USER" --password "$FRESHRSS_DEFAULT_PASSWORD" 2>&1)
|
||||
if [ $? -ne 0 ]; then
|
||||
case "$UCREATE" in
|
||||
*"username already taken"*) ;;
|
||||
*)
|
||||
echo "$UCREATE"
|
||||
rm -rf "/var/www/app/data/users/$FRESHRSS_DEFAULT_USER"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
printf "Result: success\n\n"
|
||||
fi
|
||||
|
||||
/usr/local/bin/gomplate -o /var/www/app/data/config.php -f /etc/templates/config.php.tmpl
|
||||
if [ -f "/var/www/app/data/do-install.txt" ]; then
|
||||
rm -rf /var/www/app/data/do-install.txt
|
||||
fi
|
||||
|
||||
log_info "Start FreshRSS Server\n"
|
||||
supercronic /etc/crontabs/nginx &
|
||||
php-fpm81 -F &
|
||||
php-fpm7 -F &
|
||||
exec nginx -g "daemon off;"
|
||||
|
|
|
@ -1,12 +1,3 @@
|
|||
#!/usr/bin/env sh
|
||||
|
||||
# shellcheck disable=SC3040
|
||||
set -eo pipefail
|
||||
|
||||
if [ "$(gomplate -i '{{ getenv "FRESHRSS_API_ENABLED" "false" | conv.ToBool }}')" = "true" ]; then
|
||||
(php -r "readfile('http://127.0.0.1:8080/api/fever.php');" | grep -q 'api_version') || exit 1
|
||||
else
|
||||
(php -r "readfile('http://127.0.0.1:8080/i/');" | grep -q 'jsonVars') || exit 1
|
||||
fi
|
||||
|
||||
exit 0
|
||||
(php -r "readfile('http://127.0.0.1:8080/i/');" | grep -q 'jsonVars') || exit 1
|
||||
|
|
Reference in New Issue
Block a user