Skip to content

Commit 8be79b8

Browse files
committed
Removed redcarpet markdown, added new blogpost
1 parent 434c47f commit 8be79b8

File tree

6 files changed

+117
-5
lines changed

6 files changed

+117
-5
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
_site/
22
.sass-cache/
33
.jekyll-metadata
4+
.jekyll-cache

Gemfile

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# frozen_string_literal: true
2+
3+
source "https://rubygems.org"
4+
5+
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
6+
7+
# gem "rails"
8+
9+
gem "jekyll", "~> 4.2"

Gemfile.lock

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
addressable (2.8.0)
5+
public_suffix (>= 2.0.2, < 5.0)
6+
colorator (1.1.0)
7+
concurrent-ruby (1.1.9)
8+
em-websocket (0.5.3)
9+
eventmachine (>= 0.12.9)
10+
http_parser.rb (~> 0)
11+
eventmachine (1.2.7)
12+
ffi (1.15.4)
13+
forwardable-extended (2.6.0)
14+
http_parser.rb (0.8.0)
15+
i18n (1.8.11)
16+
concurrent-ruby (~> 1.0)
17+
jekyll (4.2.1)
18+
addressable (~> 2.4)
19+
colorator (~> 1.0)
20+
em-websocket (~> 0.5)
21+
i18n (~> 1.0)
22+
jekyll-sass-converter (~> 2.0)
23+
jekyll-watch (~> 2.0)
24+
kramdown (~> 2.3)
25+
kramdown-parser-gfm (~> 1.0)
26+
liquid (~> 4.0)
27+
mercenary (~> 0.4.0)
28+
pathutil (~> 0.9)
29+
rouge (~> 3.0)
30+
safe_yaml (~> 1.0)
31+
terminal-table (~> 2.0)
32+
jekyll-sass-converter (2.1.0)
33+
sassc (> 2.0.1, < 3.0)
34+
jekyll-watch (2.2.1)
35+
listen (~> 3.0)
36+
kramdown (2.3.1)
37+
rexml
38+
kramdown-parser-gfm (1.1.0)
39+
kramdown (~> 2.0)
40+
liquid (4.0.3)
41+
listen (3.7.0)
42+
rb-fsevent (~> 0.10, >= 0.10.3)
43+
rb-inotify (~> 0.9, >= 0.9.10)
44+
mercenary (0.4.0)
45+
pathutil (0.16.2)
46+
forwardable-extended (~> 2.6)
47+
public_suffix (4.0.6)
48+
rb-fsevent (0.11.0)
49+
rb-inotify (0.10.1)
50+
ffi (~> 1.0)
51+
rexml (3.2.5)
52+
rouge (3.27.0)
53+
safe_yaml (1.0.5)
54+
sassc (2.4.0)
55+
ffi (~> 1.9)
56+
terminal-table (2.0.0)
57+
unicode-display_width (~> 1.1, >= 1.1.1)
58+
unicode-display_width (1.8.0)
59+
60+
PLATFORMS
61+
x86_64-linux
62+
63+
DEPENDENCIES
64+
jekyll (~> 4.2)
65+
66+
BUNDLED WITH
67+
2.2.33

_config.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ signoff: GoS
55
disqus_shortname: geeksonsecurity
66
highlighter: rouge
77
permalink: pretty
8-
markdown: redcarpet
9-
redcarpet:
10-
extensions:
11-
- smart
8+
markdown: kramdown
129

1310
links:
1411
- name: Home
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
layout: post
3+
title: Configure IPSec PSK RAS on Mikrotik
4+
category: tips-tricks
5+
tags: [networking, ipsec, mikrotik]
6+
disqus: y
7+
---
8+
9+
The following config has been tested on MikroTik RouterOS 6.48.4 against the following RAS clients:
10+
* Android 11 native VPN client (IPSec PSK)
11+
* macOS Big Sur 11.3 native VPN client
12+
13+
The RAS clients will get an IP in the `10.2.10.0/24` subnet. No split tunnelling.
14+
15+
```mikrotik
16+
/ip ipsec peer
17+
add exchange-mode=ike2 name=peer1 passive=yes send-initial-contact=no
18+
/ip ipsec profile
19+
set [ find default=yes ] dh-group=ecp256,ecp384,modp2048 enc-algorithm=aes-256 hash-algorithm=sha256
20+
/ip ipsec proposal
21+
set [ find default=yes ] auth-algorithms=sha256 enc-algorithms=aes-256-cbc lifetime=1d pfs-group=none
22+
/ip ipsec identity
23+
add generate-policy=port-strict mode-config=vpn peer=peer1 secret=YOURPSKSECRET
24+
/ip pool
25+
add name=vpn-pool ranges=10.2.10.100-10.2.10.150
26+
/ip ipsec mode-config
27+
add address-pool=vpn-pool address-prefix-length=32 name=vpn static-dns=10.2.10.10 system-dns=no
28+
/ip ipsec policy
29+
add dst-address=0.0.0.0/0 src-address=0.0.0.0/0 template=yes
30+
/ip firewall filter
31+
add action=accept chain=input in-interface=ether1-wan port=1701,500,4500 protocol=udp
32+
add action=accept chain=input in-interface=ether1-wan protocol=ipsec-esp
33+
/ip firewall nat
34+
add action=masquerade chain=srcnat out-interface=ether1-wan src-address-list=vpn-lan
35+
```

stylesheets/style.css

+4-1
Original file line numberDiff line numberDiff line change
@@ -416,11 +416,13 @@ pre {
416416
-moz-box-sizing: border-box;
417417
box-sizing: border-box;
418418
}
419+
419420
code {
420421
font-size: 13px;
421422
color: #ffffff;
422423
background: #0e1f31;
423-
padding: 2px 4px 3px;
424+
padding: 5px 10px 5px 10px;
425+
margin: 5px 5px 5px 5px;
424426
border-radius: 2px;
425427
line-height: 1.3em;
426428
display: inline-block;
@@ -429,6 +431,7 @@ code {
429431
*display: inline;
430432
*vertical-align: auto;
431433
}
434+
432435
img {
433436
max-width: 100%;
434437
}

0 commit comments

Comments
 (0)