Compare commits

..

5 Commits

4 changed files with 6 additions and 69 deletions

View File

@ -24,9 +24,10 @@
^[ :[:alnum:]]{15} {{ hostname }} systemd\[[0-9]+\]: Stopped LSB: process and login accounting. ^[ :[:alnum:]]{15} {{ hostname }} systemd\[[0-9]+\]: Stopped LSB: process and login accounting.
^[ :[:alnum:]]{15} {{ hostname }} systemd\[[0-9]+\]: Finished system activity accounting tool. ^[ :[:alnum:]]{15} {{ hostname }} systemd\[[0-9]+\]: Finished system activity accounting tool.
^[ :[:alnum:]]{15} {{ hostname }} systemd\[[0-9]+\]: Finished Generate a daily summary of process accounting. ^[ :[:alnum:]]{15} {{ hostname }} systemd\[[0-9]+\]: Finished Generate a daily summary of process accounting.
^[ :[:alnum:]]{15} {{ hostname }} systemd\[[0-9]+\]: apt-daily.service: Consumed \[[0-9]+\].\[[0-9]+\]s CPU time. ^[ :[:alnum:]]{15} {{ hostname }} systemd\[[0-9]+\]: Finished Cleanup of Temporary Directories.
^[ :[:alnum:]]{15} {{ hostname }} systemd\[[0-9]+\]: apt-daily-upgrade.service: Consumed \[[0-9]+\].\[[0-9]+\]s CPU time. ^[ :[:alnum:]]{15} {{ hostname }} systemd\[[0-9]+\]: Finished Kernel process accounting.
^[ :[:alnum:]]{15} {{ hostname }} systemd\[[0-9]+\]: apt-daily.service: Consumed [[:digit:]]+.[[:digit:]]+s CPU time.
^[ :[:alnum:]]{15} {{ hostname }} systemd\[[0-9]+\]: apt-daily-upgrade.service: Consumed [[:digit:]]+.[[:digit:]]+s CPU time.
^[ :[:alnum:]]{15} {{ hostname }} accton\[[0-9]+\]: Turning on process accounting, file set to '/var/log/account/pacct'. ^[ :[:alnum:]]{15} {{ hostname }} accton\[[0-9]+\]: Turning on process accounting, file set to '/var/log/account/pacct'.
^[ :[:alnum:]]{15} {{ hostname }} accton\[[0-9]+\]: Turning off process accounting. ^[ :[:alnum:]]{15} {{ hostname }} accton\[[0-9]+\]: Turning off process accounting.
^[ :[:alnum:]]{15} {{ hostname }} accton\[[0-9]+\]: Done.. ^[ :[:alnum:]]{15} {{ hostname }} accton\[[0-9]+\]: Done..

View File

@ -20,7 +20,6 @@ services:
html: html:
container_name: html container_name: html
build: html
image: registry.wojciechkozlowski.eu/wojtek/loki/html image: registry.wojciechkozlowski.eu/wojtek/loki/html
restart: always restart: always
@ -46,7 +45,6 @@ services:
nextcloud-app: nextcloud-app:
container_name: nextcloud-app container_name: nextcloud-app
build: nextcloud
image: registry.wojciechkozlowski.eu/wojtek/loki/nextcloud image: registry.wojciechkozlowski.eu/wojtek/loki/nextcloud
links: links:
- nextcloud-db - nextcloud-db
@ -71,7 +69,7 @@ services:
gitlab: gitlab:
container_name: gitlab container_name: gitlab
image: gitlab/gitlab-ce image: gitlab/gitlab-ce:15.2.0-ce.0
environment: environment:
GITLAB_OMNIBUS_CONFIG: | GITLAB_OMNIBUS_CONFIG: |
external_url 'https://gitlab.wojciechkozlowski.eu' external_url 'https://gitlab.wojciechkozlowski.eu'
@ -87,7 +85,6 @@ services:
- gitlab_config:/etc/gitlab - gitlab_config:/etc/gitlab
- gitlab_logs:/var/log/gitlab - gitlab_logs:/var/log/gitlab
- gitlab_data:/var/opt/gitlab - gitlab_data:/var/opt/gitlab
- ./gitlab/ssh_config:/etc/ssh/ssh_config
restart: always restart: always
# See https://docs.gitlab.com/ee/ci/docker/using_docker_build.html for how to # See https://docs.gitlab.com/ee/ci/docker/using_docker_build.html for how to
@ -123,7 +120,6 @@ services:
proxy: proxy:
container_name: proxy container_name: proxy
build: proxy
image: registry.wojciechkozlowski.eu/wojtek/loki/proxy image: registry.wojciechkozlowski.eu/wojtek/loki/proxy
ports: ports:
- 80:80 - 80:80

View File

@ -1,60 +0,0 @@
# This is the ssh client system-wide configuration file. See
# ssh_config(5) for more information. This file provides defaults for
# users, and the values can be changed in per-user configuration files
# or on the command line.
# Configuration data is parsed as follows:
# 1. command line options
# 2. user-specific file
# 3. system-wide file
# Any configuration value is only changed the first time it is set.
# Thus, host-specific definitions should be at the beginning of the
# configuration file, and defaults at the end.
# Site-wide defaults for some commonly used options. For a comprehensive
# list of available options, their meanings and defaults, please see the
# ssh_config(5) man page.
Host github.com
StrictHostKeyChecking no
IdentityFile /etc/gitlab/github-rsa
Host *
# ForwardAgent no
# ForwardX11 no
# ForwardX11Trusted yes
# RhostsRSAAuthentication no
# RSAAuthentication yes
# PasswordAuthentication yes
# HostbasedAuthentication no
# GSSAPIAuthentication no
# GSSAPIDelegateCredentials no
# GSSAPIKeyExchange no
# GSSAPITrustDNS no
# BatchMode no
# CheckHostIP yes
# AddressFamily any
# ConnectTimeout 0
# StrictHostKeyChecking ask
# IdentityFile ~/.ssh/identity
# IdentityFile ~/.ssh/id_rsa
# IdentityFile ~/.ssh/id_dsa
# IdentityFile ~/.ssh/id_ecdsa
# IdentityFile ~/.ssh/id_ed25519
# Port 22
# Protocol 2
# Cipher 3des
# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
# EscapeChar ~
# Tunnel no
# TunnelDevice any:any
# PermitLocalCommand no
# VisualHostKey no
# ProxyCommand ssh -q -W %h:%p gateway.example.com
# RekeyLimit 1G 1h
SendEnv LANG LC_*
HashKnownHosts yes
GSSAPIAuthentication yes
GSSAPIDelegateCredentials no

View File

@ -1,4 +1,4 @@
FROM nextcloud:fpm FROM nextcloud:24-fpm
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get -y upgrade RUN apt-get update && apt-get -y upgrade