actcur/salt
3
0
Fork 0
Code Issues 5 Pull requests Projects Releases Wiki Activity

fixed teampass ldap issue

Browse source
This commit is contained in:
Beth Parker 2017-11-13 22:28:24 -06:00
parent e88ce4b94d
commit 228a29acfe
5 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pillars/roles/ca/vpnclients.sls
View file

@ -3,3 +3,5 @@ ca:
type: client type: client
masau-llm.actcur.com: masau-llm.actcur.com:
type: client type: client
masau-apm.actcur.com:
type: client

3
pillars/roles/services/vpnserver.sls Normal file
View file

@ -0,0 +1,3 @@
services:
vpnserver:
openvpn-server@server.service: []

2
states/roles/maintain/pass/php.ini
View file

@ -897,7 +897,7 @@ extension=gd.so
extension=iconv.so extension=iconv.so
;extension=imap.so ;extension=imap.so
;extension=intl.so ;extension=intl.so
;extension=ldap.so extension=ldap.so
extension=mcrypt.so extension=mcrypt.so
extension=mysqli.so extension=mysqli.so
;extension=odbc.so ;extension=odbc.so

7
states/roles/maintain/vpnserver/init.sls
View file

@ -39,3 +39,10 @@ vpn-ca-cert:
- user: root - user: root
- group: root - group: root
- mode: 644 - mode: 644
vpn-server-service:
service.running:
- name: openvpn-server@server.service
- enable: true
- watch:
- file: vpn-server-conf

8
states/roles/maintain/vpnserver/server.conf
View file

@ -98,7 +98,7 @@ dh dh.pem
# Each client will be able to reach the server # Each client will be able to reach the server
# on 10.8.0.1. Comment this line out if you are # on 10.8.0.1. Comment this line out if you are
# ethernet bridging. See the man page for more info. # ethernet bridging. See the man page for more info.
server 10.8.0.0 255.255.255.0 server 172.16.50.0 255.255.255.0
# Maintain a record of client <-> virtual IP address # Maintain a record of client <-> virtual IP address
# associations in this file. If OpenVPN goes down or # associations in this file. If OpenVPN goes down or
@ -138,7 +138,7 @@ ifconfig-pool-persist ipp.txt
# to know to route the OpenVPN client # to know to route the OpenVPN client
# address pool (10.8.0.0/255.255.255.0) # address pool (10.8.0.0/255.255.255.0)
# back to the OpenVPN server. # back to the OpenVPN server.
;push "route 192.168.10.0 255.255.255.0" push "route 172.16.0.0 255.255.0.0"
;push "route 192.168.20.0 255.255.255.0" ;push "route 192.168.20.0 255.255.255.0"
# To assign specific IP addresses to specific # To assign specific IP addresses to specific
@ -189,7 +189,7 @@ ifconfig-pool-persist ipp.txt
# (The OpenVPN server machine may need to NAT # (The OpenVPN server machine may need to NAT
# or bridge the TUN/TAP interface to the internet # or bridge the TUN/TAP interface to the internet
# in order for this to work properly). # in order for this to work properly).
;push "redirect-gateway def1 bypass-dhcp" push "redirect-gateway def1 bypass-dhcp"
# Certain Windows-specific network settings # Certain Windows-specific network settings
# can be pushed to clients, such as DNS # can be pushed to clients, such as DNS
@ -197,7 +197,7 @@ ifconfig-pool-persist ipp.txt
# http://openvpn.net/faq.html#dhcpcaveats # http://openvpn.net/faq.html#dhcpcaveats
# The addresses below refer to the public # The addresses below refer to the public
# DNS servers provided by opendns.com. # DNS servers provided by opendns.com.
;push "dhcp-option DNS 208.67.222.222" push "dhcp-option DNS 172.16.40.20"
;push "dhcp-option DNS 208.67.220.220" ;push "dhcp-option DNS 208.67.220.220"
# Uncomment this directive to allow different # Uncomment this directive to allow different