* letsencrypt: fix active status check
Signed-off-by: nachoparker <nacho@ownyourbits.com>
* letsencrypt: take into account duplicate domains ending in -0001
Signed-off-by: nachoparker <nacho@ownyourbits.com>
* letsencrypt: fix renewal with httpsonly enabled
Signed-off-by: nachoparker <nacho@ownyourbits.com>
* fix inverted template logic for docker
Signed-off-by: nachoparker <nacho@ownyourbits.com>
* library.sh: Move templating to separate function
- Backup old file before templating (and restore on failure)
- Use stderr in the template for debug/info output
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* library.sh: Fix syntax error
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* library.sh: Only fallback to default config if explicitly allowed
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* letsencrypt.sh: Set cert-name
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* nextcloud.conf.sh: Use certificate named ncp-nextcloud if available
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* letsencrypt.sh: Support multiple, comma separated domains in field "OTHER_DOMAIN"
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* nextcloud.conf.sh: Fix path resolution for certificates
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* letsencrypt.sh: Improve warning about max trusted domains reached
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* letsencrypt.sh: Fix max trusted domains check
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* letsencrypt.sh: Fix splitting of domain string by comma
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* letsencrypt.sh: Fix splitting of domain string to array
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* adjustments for docker/lxc
Signed-off-by: nachoparker <nacho@ownyourbits.com>
Co-authored-by: nachoparker <nacho@ownyourbits.com>
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
nextcloud.conf.sh: Fix apps overwriting each other during templating
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
nextcloud.conf.sh: Make --default mode failsafe (don't expect apps to be installed)
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
nextcloud.conf.sh: Allow any user name for metrics endpoint
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
nextcloudpi/Dockerfile: Copy the templates directory to the container
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
lamp/Dockerfile: Copy the templates directory to the container
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
install.sh: Ensure templates are available before executing nc-nextcloud.sh
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* metrics.{sh,cfg}: Implement ncp-app for prometheus (system) metrics
letsencrypts.sh, nc-nextcloud.sh, nextcloud.conf.sh: Introduce templating/generator concept to allow multiple ncp apps to edit the same file without conflicts
library.sh: Add convenience function find_app_param
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* letsencrypt.sh: Remove commented code
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* metrics.cfg: Deactivate by default
- Add title, description and remove TODO entries
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* metrics.sh: Restart apache after enabling proxy_http
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* update.sh: Update ncp-templates directory during updates
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* update.sh: Copy ncp-templates directory, not just its content
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* metrics.sh,update.sh: Disable metrics in docker for now
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* metrics.sh: Disable prometheus-node-exporter via systemctl
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* metrics.sh: Move apache mod configuration to updates
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* metrics.cfg: Remove invalid parameter type
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* metrics.sh: Create /etc/default/prometheus-node-exporter via heredoc
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* nextcloud.conf.sh: Prevent template parsing error if metrics.sh is disabled (i.e. on docker)
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* metrics.cfg: Add info directing users to my preconfigured ncp dashboard
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* Various fixes
- metrics.sh: Fix is_active function always returning 1
- metrics.sh: Fix apache2 reload potentially interrupting web ui
- nc-nextcloud.sh: exit if nextcloud.conf templating fails
- various readability and code style improvements
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* letsencrypt.sh: Use consistent return codes in tmpl_letsencrypt_domain
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* nextcloud.conf.sh: Remove obsolete return code escape
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* nextcloud.conf.sh: Ensure that the snakeoil self-signed cert exists before enabling it
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
* updates/1.36.4.sh: Reload apache in the background instead of restarting it blockingly
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
Cronjobs should not have any output, unless the cronjob fails, otherwise
an e-mail notification is sent with the output. This cronjob in
particular is also reporting results via Nextcloud notification, so
having an e-mail with logs saying the same as the notification is not
particularly useful. Instead we just redirect all output to the
/var/log/ncp.log so the user can debug in case of problems and doesn't
receive spurious e-mails when all works fine.
Signed-off-by: Leandro Lucarella <luca@llucax.com>
Signed-off-by: nachoparker <nacho@ownyourbits.com>
