Pi-hole/pivpn
Pi-hole/pivpn
1
0
Fork 0
mirror of https://github.com/pivpn/pivpn.git synced 2024-12-18 19:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
696 commits 3 branches 49 tags 3.4 MiB
Commit graph

339 commits

Author SHA1 Message Date
Orazio
85907f6b80
Merge branch 'test' into shellcheck4test 2019-12-10 14:53:11 +01:00
Orazio
8936dd2b08
Merge pull request #877 from corbolais/debian-ownership 
debian openvpn has dedicated user and group, so rather use those than…
 2019-12-10 14:49:23 +01:00
Orazio
3687a124bd
Merge pull request #876 from corbolais/dns-4test 
add local resolver as DNS option.
 2019-12-10 14:36:30 +01:00
corbolais
41dbf2b5c6 merge: drop bsdmainutils pkg 
Signed-off-by: corbolais <corbolais@gmail.com>
 2019-12-09 19:18:58 +01:00
Orazio
cd1b8fbf7f Use printf with column in the listCONF.sh script 2019-12-09 17:05:34 +01:00
corbolais
e76f3755ab consistent use of pivpnNET, subnetClass and vpnGw. 
Signed-off-by: corbolais <corbolais@gmail.com>
 2019-12-09 12:41:40 +01:00
corbolais
55dc52d3e0 use openvpn:openvpn user/group ownership unconditionally. 
Signed-off-by: corbolais <corbolais@gmail.com>
 2019-12-08 20:41:11 +01:00
corbolais
e72786e8de W/space 
Signed-off-by: corbolais <corbolais@gmail.com>
 2019-12-08 20:37:41 +01:00
corbolais
3c280e0a94 Mostly bug fixes. Mostly harmless. 
Signed-off-by: corbolais <corbolais@gmail.com>
 2019-12-08 20:35:41 +01:00
corbolais
a05754ea19 shellcheck install.sh. render into sound bashing. correct sed call. 
Signed-off-by: corbolais <corbolais@gmail.com>
 2019-12-08 20:14:23 +01:00
corbolais
1aa6472b72 chg: openvpn-user home, shell. 
Signed-off-by: corbolais <corbolais@gmail.com>
 2019-12-08 17:40:30 +01:00
corbolais
6e763e0240 Debian: add openvpn user/group if missing. 
Signed-off-by: corbolais <corbolais@gmail.com>
 2019-12-08 17:34:57 +01:00
corbolais
9c62fe0991 take care of /etc/ufw/before.rules nat section. safeguard against accidentally killing the file. 
Signed-off-by: corbolais <corbolais@gmail.com>
 2019-12-08 17:18:08 +01:00
corbolais
8affc9a313 debian openvpn has dedicated user and group, so rather use those than nobody:nogroup (as do _many_ other packages and thus all having access to such owned files). 
Signed-off-by: corbolais <corbolais@gmail.com>
 2019-12-08 16:39:46 +01:00
corbolais
93044d6f6d add local resolver as DNS option. 
Signed-off-by: corbolais <corbolais@gmail.com>
 2019-12-08 16:13:26 +01:00
Orazio
4466f1503c Better client stats formatting 2019-12-03 17:59:27 +01:00
Orazio
e2941f8fae Properly avoid pulling unwanted packages from unstable repo 
Currently apt pulls all packages from the unstable repo because the
  script intendation created the file 'limit-unstable' with tabs in it.
  Fixed using printf to create a multiline file (which is the way
  wireguard.com/install suggests).
 2019-12-02 17:00:39 +01:00
cfcolaco
d243d9ae12 Fixed Typo 
Line 1262: s/jkkprintf/printf/
 2019-11-29 10:45:32 +01:00
Orazio
d34577329e Removed reference to deleted branch 2019-11-27 11:59:53 +01:00
Orazio
a03d4e1be2 Fix typo 2019-11-20 18:50:57 +01:00
Orazio
e2da52b1a7 Added Ubuntu Bionic support 2019-11-19 17:29:41 +01:00
Orazio
1ff6f7e9e8 Removed trivial command output 2019-11-18 12:42:04 +01:00
Orazio
34c10a81f3 Renamed pivpnDOMAIN to pivpnSEARCHDOMAIN 2019-11-16 21:25:34 +01:00
Orazio
8ab71601ff Automatically fetch latest WireGuard snapshot 2019-11-16 17:02:15 +01:00
Orazio
d7ebb4cca9 Unattended installation 2019-11-16 14:58:58 +01:00
Orazio
5cb8a05317 Minor unattended fixes, adjusted openvpn settings 2019-11-14 17:42:56 +01:00
Orazio
07abfc97e9 Added unattended installation, fixed some variables 2019-11-14 15:07:01 +01:00
Orazio
6bd0beeb94 Fixed missing protocol variable 2019-11-07 18:12:06 +01:00
Orazio
84f90b00a4 Added uninstall and Pi-hole detection 2019-11-07 17:29:21 +01:00
4s3ti
080b335047
Merge pull request #850 from IcedComputer/patch-3 
Create OVPN12_Compatible file
 2019-10-19 11:58:03 +02:00
IcedComputer
fa21666869
Create OVPN12_capable file 
MakeOVPN has been updated to include the -i iOS function to allow users to create an OVPN12 format file that can be used with the iOS keychain.  Since the OVPN12 format is incompatible with OpenVPN 2.4 - this change creates a configuration file that determines if the user can create a -i request via MakeOVPN.
 2019-10-18 21:00:00 -07:00
Orazio
e77f668021 Kernel headers are required when installing from package too 2019-10-16 18:17:16 +02:00
Orazio
5c97221d3f Revert some variable names and fix iptables rules 2019-10-16 12:01:50 +02:00
Orazio
3c973e2a48 Bugfixes 2019-10-14 16:51:43 +02:00
Orazio
1777d5c239 Added back Debian 10 support 2019-10-14 15:06:34 +02:00
Orazio
24a1a00d37 Refactoring + WireGuard support 2019-10-14 12:11:16 +02:00
Rob Gill
da4cc1ced5 Regex specifies : must start with alphanumeric, may have no more 
than two consecutive hyphens, must not end or start with hyphen,
final must be at least two apha characters.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2019-10-14 19:59:00 +10:00
4s3ti
9f20f50e61 Bugfixes and improvements, check update notes 2019-10-12 18:34:37 +02:00
4s3ti
d0c10db6ec install.sh: apt-get with , uninstall.sh: added var PKG_MANAGER and replaced apt-get with 2019-09-03 10:09:48 +02:00
cfcolaco
510979ae90 removing bitwarden installation from script 2019-09-02 14:27:10 +02:00
cfcolaco
50ad223e83 after merge bugfixes, bitwarden optional, error handling, perm fixes 2019-09-02 13:35:54 +02:00
4s3ti
b1dbe27b2d fixed conflicts between pr #871 and local works 2019-09-01 19:48:50 +02:00
4s3ti
a884d22cbc Issues Introduced with lastest commits: 
Install script not creating ovpns dir, and throwing error:

```
cp: cannot stat '/tmp/OLD_UFW': No such file or directory
mkdir: cannot create directory ‘/root\n/usr/sbin\n/bin\n/dev\n/bin\n/usr/games\n/var/cache/man\n/var/spool/lpd\n/var/mail\n/var/spool/news\n/var/spool/uucp\n/bin\n/var/www\n/var/backups\n/var/list\n/var/run/ircd\n/var/lib/gnats\n/nonexistent\n/nonexistent\n/run/systemd\n/run/systemd\n/run/systemd\n/nonexistent\n/run/sshd\n/\n/home/pivpntest/ovpns’: No such file or directory
chmod: cannot access '/root'$'\n''/usr/sbin'$'\n''/bin'$'\n''/dev'$'\n''/bin'$'\n''/usr/games'$'\n''/var/cache/man'$'\n''/var/spool/lpd'$'\n''/var/mail'$'\n''/var/spool/news'$'\n''/var/spool/uucp'$'\n''/bin'$'\n''/var/www'$'\n''/var/backups'$'\n''/var/list'$'\n''/var/run/ircd'$'\n''/var/lib/gnats'$'\n''/nonexistent'$'\n''/nonexistent'$'\n''/run/systemd'$'\n''/run/systemd'$'\n''/run/systemd'$'\n''/nonexistent'$'\n''/run/sshd'$'\n''/'$'\n''/home/pivpntest/ovpns': No such file or directory
```

Found incosistencies in instalation user var/files namings, to have it consistend and easy to understand and considering everyone is more familiar with INSTALL_USER

Changed $pivpnUser to INSTALL_USER
Changed pivpnUSR to INSTALL_USER

Removed PiVPN Secure Notes from PiVPN ADD introduced with PR #794
	- Notes not being pushed to BW Vault
	- OVPN files not going to ovpns dir
	- Needs investigation
 2019-09-01 19:39:37 +02:00
MichaIng
73b23c525b
Failsafe home dir obtaining 
+ When estimating $INSTALL_HOME, assure grep can only match user names, to avoid possible wrong multi-line value
+ Remove possible trailing slash from $INSTALL_HOME, to avoid double slash in "$INSTALL_HOME/ovpns"
+ Avoid "cat <file> | grep <pattern>", since grep can process files directly

Signed-off-by: MichaIng <micha@dietpi.com>
 2019-09-01 17:39:38 +02:00
4s3ti
ad466f8728 Permissions hardening and Standardization 2019-09-01 16:10:53 +02:00
4s3ti
1bd8169aa6
Merge branch 'test' into master 2019-09-01 15:32:56 +02:00
IcedComputer
a2f7ef7e34
Update install.sh 2019-08-27 15:46:56 -07:00
IcedComputer
64353e337b
Update install.sh 2019-08-27 15:20:00 -07:00
IcedComputer
6e7819509c
Merge branch 'test' into patch-1 2019-08-27 12:55:55 -07:00
IcedComputer
efb8453651
Update install.sh 
added uuidgen dependency and changed method of server name generation.
 2019-08-27 12:54:59 -07:00
IcedComputer
09c518408e
Update install.sh 2019-08-27 12:50:34 -07:00
Douglas Orend
8b40035bf5 Properly determine user's home directory 
Code assumes that the specified user directory is under /home.  This code parses the /etc/passwd file in order to determine what that user's proper home directory is.
 2019-08-13 11:23:08 -05:00
4s3ti
18b7e16694
Merge branch 'test' into bitwarden 2019-08-08 10:34:17 +02:00
Orazio
e6a13cc65e Handle older UFW version from Jessie 2019-08-06 09:53:14 +02:00
Akvile
b60a06791d integrated bitwarden password manager into pivpn 2019-07-23 22:12:35 +02:00
4s3ti
e8883238f5
Merge pull request #789 from revolter/patch-1 
Fix typo in a setup message
 2019-07-14 00:30:24 +01:00
Iulian Onofrei
2ba8b0c262
Fix typo in a setup message 2019-07-14 01:01:44 +03:00
Orazio
1b54558769 Fix update option 2019-07-13 12:48:53 +02:00
Orazio
241e06f970 Miscellaeous fixes 2019-07-13 10:45:44 +02:00
4s3ti
52bf326d8a
Merge pull request #783 from bgrainger/patch-1 
Fix typo in "separated"
 2019-07-05 20:21:59 +01:00
Bradley Grainger
0189c6983e
Fix typo in "separated". 2019-07-04 19:47:51 -07:00
Orazio
66dcd69fd5 Only use iptables-legacy if platform is Buster 2019-07-03 10:13:22 +02:00
4s3ti
7aa803720c
Merge pull request #777 from orazioedoardo/debug-privacy 
Hide client IPs inside the debug log
 2019-07-02 13:10:43 +01:00
4s3ti
d32aafe61f
Merge pull request #778 from orazioedoardo/iptables-detection 
Improve iptables detection
 2019-07-02 13:08:44 +01:00
Orazio
b823737b5a Hide client IPs in the debug log 2019-07-01 15:44:00 +02:00
Orazio
0ad342e007 Fixed typo 2019-07-01 11:36:01 +02:00
Orazio
7a34dd3704 Improve iptables detection 2019-07-01 11:12:46 +02:00
Orazio
95480f3279 Add support for Raspbian Buster 2019-06-26 10:35:56 +02:00
IcedComputer
2e5a344c82
Fixed issue with grabbing hostname 
Per comments and recommendations, added the "-s" when grabbing the hostname.  This will ensure uniform performance across various platforms.
 2019-06-20 17:37:56 -07:00
IcedComputer
ce9b8dfffc
Leverage the Hostname of the Server 
Historic versions leveraged a format of "server_$UUID" to name of the VPN server certificate for X509 verification.  This seems very impersonal.  The new code pulls the existing hostname of the machines and appends the 16 character UUID.  The new format is $hostname_$UUID.

Example:
A machine named "Martian" with a UUID of 1234567890123456 would change from server_1234567890123456 to Martian_1234567890123456
 2019-06-19 15:48:46 -07:00
4s3ti
def92ed83d Added support info 2019-06-06 16:59:15 +02:00
4s3ti
dafd3da38c
Merge branch 'master' into test 2019-05-14 00:15:34 +01:00
4s3ti
616c2e24c4 Removed /24, fixed issue template 2019-05-13 23:06:14 +01:00
Calvin Loncaric
1af5c26034
Flush disk writes before reboot 
This commit introduces a `sync` call before the install script exits.

The writes that this script does during setup do not reach persistent
storage until the kernel decides to flush them.  The reboot sequence
might drop those pending writes on the floor.  To mitigate that
possibility (but not fully eliminate it), the script now calls `sync`,
which waits until the kernel has flushed its write cache.
 2019-05-13 10:26:07 -07:00
Orazio
05d7d84809 Remove reference to a deleted file 2019-05-08 15:29:43 +02:00
Orazio
e26cef1863 Custom certificate duration and more flexible names 2019-05-08 13:01:56 +02:00
Orazio
63d3335f33 Resolved merge conflict 2019-05-03 10:26:56 +02:00
Jorge Frade
b75b36f482
Fix Easy-RSA install 
Renamed from EasyRSA-{version}.tgz to EasyRSA-unix-v{version}.tgz
 2019-04-10 17:54:31 +01:00
james-lasersoft
bd6a1e10ac
Merge pull request #711 from shian15810/master 
Fixed rsyslog deprecated discard from ~ to stop
 2019-04-10 00:41:50 -05:00
james-lasersoft
577d662a7c
Merge pull request #704 from Giraffe1966/shallow-clone 
Use shallow clone for make_repo and update_repo.
 2019-04-10 00:30:29 -05:00
Chuah Chee Shian
4f34bd3303
fixed rsyslog deprecated discard from ~ to stop 2019-04-05 00:39:00 +08:00
Giraffe1966
bbb4b1e4f3
Update easy-rsa version. 2019-03-29 23:34:37 -04:00
Giraffe1966
cc80ca16bb
Use shallow clone for make_repo and update_repo. 2019-03-29 23:15:30 -04:00
Heidenreich
ae934253f9 Updated sed insertion to fix line overwrite 2019-03-11 11:22:31 -04:00
Heidenreich
76ae525c1d updated server.conf path 2019-03-11 10:54:54 -04:00
Alex Heidenreich
9bb82ff372 changed whiptail sizing to use PiVPN variables 2019-03-10 22:35:18 -04:00
Alex Heidenreich
9808234792 Called valid_domain function in SetCustomDomain() 2019-03-10 22:33:20 -04:00
Alex Heidenreich
0cd9e0deb6 Added function valid_domain to check user input of custom domain 2019-03-10 20:06:49 -04:00
Alex Heidenreich
3a0d6b1b47 Fixed server.conf path 2019-03-10 14:02:37 -04:00
Alex Heidenreich
3364f76790 Added procedure to allow users to set custom search domain. 2019-03-10 13:55:14 -04:00
Alex Heidenreich
24db1bc2e2 Initial commit with comment 2019-03-05 11:32:49 -05:00
Orazio
e3f729f260 General fixes and improvements 2019-03-03 10:18:45 +01:00
Orazio
375faa6398 Update install.sh 2018-10-19 22:04:30 +01:00
Orazio
30f8508055 Update install.sh 2018-10-19 22:04:30 +01:00
Orazio
cb169bcb0c Update install.sh 2018-10-19 22:04:30 +01:00
Orazio
dd26662fdf
Update install.sh 2018-10-12 21:06:11 +02:00
Orazio
66a937f04d
Update install.sh 2018-09-04 14:38:21 +02:00
Orazio
f02f57d721
Update install.sh 2018-09-04 12:06:52 +02:00
redfast00
de76940b65
Merge pull request #554 from Giraffe1966/issue-552 
Fix issue #552 (remove dead code)
 2018-08-15 21:17:33 +02:00
redfast00
18bfa927da
Fix typo, fix #429 2018-08-15 21:15:24 +02:00
redfast00
da33c83ac4
Merge pull request #582 from alexisespinosa/master 
Create TWO_POINT_FOUR file when running unattended
 2018-08-15 20:30:25 +02:00
redfast00
028805211e
Merge pull request #562 from marvinlehmann/master 
Use latest DH parameter service API
 2018-08-15 20:20:53 +02:00
Alexis Espinosa Perez
a8b3428744 Create TWO_POINT_FOUR file when running unattended 2018-08-15 11:06:12 -05:00
Marvin Lehmann
e4067949d5
Use latest DH parameter service API 
More information at https://2ton.com.au/safeprimes/
 2018-07-18 23:01:36 +02:00
Giraffe1966
58fcaafcf1
Fix issue #552. 2018-07-02 17:34:26 -04:00
pfg
79d4245edb Fix spacing 2018-05-29 14:19:16 -07:00
pfg
fb604cdc7f Actually do it right 2018-05-29 14:17:55 -07:00
Piero
33e7ef0c91 Several changes 2018-04-02 12:07:58 +02:00
justinamcafee
9749257e08
Updated install.sh 
Added support for FamilyShield DNS from OpenDNS/CISCO
 2018-03-09 11:32:14 -06:00
Piero
4b47b5aa61 2.4 2018-02-15 10:14:03 +01:00
redfast00
c7dfe6283a
Merge pull request #379 from jellemdekker/fix/remove-excess-code 
Removed excess code
 2017-12-16 22:07:10 +01:00
Jelle Dekker
9f46f1ef91 Removed call to deleted method. 2017-10-11 22:55:58 -05:00
cfcolaco
89a928e7c4 fixed (more) Typos and sentences 2017-10-08 20:10:57 +01:00
cfcolaco
664087bf92 fixed typo 2017-10-08 19:47:30 +01:00
cfcolaco
c1918417d6 added support to Stretch, removed useless code, added info about stretch support 2017-10-08 18:27:43 +01:00
cfcolaco
29a5dbb22b Revert "Revert "Added support to Stretch, Fixed some texts, Removed some lines for testing pruposes"" 
This reverts commit 6e8d6d24b5.
 2017-10-08 13:19:01 +01:00
cfcolaco
6e8d6d24b5 Revert "Added support to Stretch, Fixed some texts, Removed some lines for testing pruposes" 
This reverts commit 2626127be1.
 2017-10-08 13:08:57 +01:00
cfcolaco
2626127be1 Added support to Stretch, Fixed some texts, Removed some lines for testing pruposes 2017-10-08 12:54:24 +01:00
cfcolaco
a5258d9f3c Merging master comits into testing 2017-10-08 11:26:42 +01:00
Jelle Dekker
14b13d3a41 Removed the previously commented-out code. 2017-09-23 19:17:35 -05:00
redfast00
a8deeaf18b Merge pull request #363 from jellemdekker/fix/improve-dh-selection-menu 
Improved encryption strength selection menu
 2017-09-24 01:16:33 +02:00
redfast00
009e4b3023 Merge pull request #362 from jellemdekker/feature/randomize-server-name 
Randomize server Common Name for added security
 2017-09-24 01:13:34 +02:00
redfast00
003b27362f Merge pull request #361 from jellemdekker/feature/generate-crl-during-installation 
Generate and activate CRL during installation
 2017-09-24 01:12:05 +02:00
Jelle Dekker
c81e793c6c Removed punctuation in list items. 2017-09-23 15:16:06 -05:00
Jelle Dekker
f5c05715de Added sudo -E. 2017-09-23 14:35:46 -05:00
Jelle Dekker
4e77245a97 Commented out code related to adding a route to the remote subnet (e.g. 192.168.0.0). 2017-09-22 16:03:38 -05:00
Jelle Dekker
7b6a358779 Modified the messages when PiVPN installation completes and client profiles are generated, so the user knows to generate a client profile per each device he/she wants to connect to the VPN with. 2017-09-22 14:11:23 -05:00
Jelle Dekker
30920115b3 Implemented that a Certificate Revocation List is generated during installation after generation of other Public Key Infrastructure. Enabled this CRL in the server config. The added benefit of this is that whenever the user now revokes a client, the change is instant. Whereas before, the first time a client was revoked, the OpenVPN server had to be restarted to enabled the then-newly-generated CRL. This change also makes the file /etc/pivpn/REVOKE_STATUS obsolete. 
Documentation: https://openvpn.net/index.php/open-source/documentation/howto.html#revoke
 2017-09-22 02:46:52 -05:00
Jelle Dekker
8910545d90 Fixed a couple of typos. 2017-09-22 02:17:53 -05:00
Jelle Dekker
d1652a03b1 The SERVER_NAME variable is used in a 'verify-x509-name' check to allow the client to verify it is talking to the correct server. However, its value was always equal to 'server'. This wasn't unique for each installation and therefore provided no additional safety check. So I've modified it to be random for each installation of PiVPN. Additionally, the variable is now actually being used when specifying the server name in the build-server-full command. 
Source for obtaining a random UUID (thank you): Earthgecko (https://gist.github.com/earthgecko/3089509)
 2017-09-21 14:39:16 -05:00
Jelle Dekker
7cf5c19789 Changed the display order of the DH options (default value is still 2048 bits) and added a warning for 1024 bits. 2017-09-20 23:24:57 -05:00
cfcolaco
fbec57d1fd changed to new openvpn repos 2017-06-29 12:03:47 +01:00
David Quattlebaum
5c4a51b695 Final testing passed 
Changes:
- Document that Devuan is supported.
- Use special PLAT name, Raspvuan for Pi version
- Use service command for any *vuan PLAT, systemd is no on any
Devuan.
- add net-tools to PIVPN_DEPS
 2017-06-06 18:27:23 -04:00
David Quattlebaum
2eb11cad0c changes for devuan 
- To simplify further additions to PLAT or OSCN, use
the case command for checking

- Treat Devuan as Debian

- Add /sbin:/usr/sbin to PATH before calling ifconfig

- Ensure net-tools is installed so we have ifconfig
 2017-06-04 16:18:26 -04:00
Jelle Dekker
d5f0a81f80 Clearly indicate that a user selects a list item with the space bar. 2017-04-17 15:49:52 +02:00
EWouters
ff97f40ecf Fix: mkdir: cannot create directory ‘/home/$pivpnUser/ovpns’: File exists 2017-03-22 13:47:55 +13:00
EWouters
cd4d13691d fixed check for when both nopass and a password argument are passed to the script 2017-03-16 22:25:17 +13:00
EWouters
27c34aa297 Removed -p flag to create home dir 
As described in #165 ( fc14664) it is not desirable.
 2017-03-15 17:24:42 +13:00
EWouters
75b7995a87 Removed SERVER_NAME parameter 
because it is hardcoded as "server" in other scripts
 2017-03-15 02:40:39 +13:00
EWouters
277a212a8f tabs to spaces 2017-03-14 15:39:53 +13:00
EWouters
097145392c set -e and set +e around line 800 to 815 
I am not sure why this statement does not work with -e. We can also
remove the set -e statement altogether.
 2017-03-14 15:39:07 +13:00
EWouters
7315353179 Moved echo to file statements to front, add missing 
fixed a typo
replaced tabs with spaces
 2017-03-14 15:25:39 +13:00
EWouters
5b5129f1bc fix: cp: cannot stat ‘/tmp/pivpnINT’: No such file 2017-03-14 14:26:22 +13:00
EWouters
2a639e753e Fixed sed command and mkdir if folder exists 2017-03-14 10:48:16 +13:00
EWouters
71021d6ffa Added all parameters, initial testing done 2017-03-13 19:44:29 +13:00
EWouters
5db23185fd Added pi-hole's undocumented flags 
UNTESTED!
 2017-03-13 17:00:28 +13:00
Kaladin Light
faaabe4c0e Fixes Issue #195 2017-01-28 13:58:10 -05:00
Kaladin Light
dc9924f147 Have debug work without being root 2017-01-27 17:46:34 -05:00
Kaladin Light
5ce48cbaaf Trying to ensure interface is set, maybe related to iptables issues. 
If not, we at least will see in pivpnDebug output now.
 2017-01-27 15:42:42 -05:00
redfast00
b727fa3970
Fix-189 2017-01-22 12:44:36 +01:00