Changeset 031ab69 for npl


Ignore:
Timestamp:
02/28/18 18:24:39 (7 years ago)
Author:
Edwin Eefting <edwin@datux.nl>
Branches:
master, perl-5.22
Children:
669bb09
Parents:
df958d5 (diff), 90f43e5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'gcc484'

Location:
npl
Files:
1 added
1 deleted
22 edited
1 moved

Legend:

Unmodified
Added
Removed

  • npl/commonservers/radius_conf/radius_conf.build

    rdf958d5 r031ab69  
    1 1
     12

  • npl/commonservers/radius_conf/radius_conf.md5

    rdf958d5 r031ab69  
    1 f99e07bd204589e3970de2d5e8e26c13  ./radius_conf.pkg
     14b7070f08d09041f4bc79db97c447980  ./radius_conf.pkg
    22d0a1aa910d8789a30f169a5f8f97b5a1  ./radius_conf.SlackBuild
    3 bed85f2f1ceb4f1f7a0ea41da891e68a  ./radius_conf.SlackBuild.log.gz
     300a6001f8295a7c919505de643e4cdd6  ./radius_conf.SlackBuild.log.gz
    44e7c9c560c9355252dd5acf6da3c8c373  ./root/etc/logrotate.d/radius
    5 2c433642eeb94c8990abc5c988772e2f  ./root/etc/postinst.d/post.radius
     5a4d228ed171e0794ac9fead55f96505c  ./root/etc/postinst.d/post.radius
    66602c3c8baf57abf04433843b251b21c9  ./root/home/system/radius/raddb/acct_users
    7724958dbed540952e6522a135ccf8f500  ./root/home/system/radius/raddb/attrs

  • npl/commonservers/radius_conf/root/etc/postinst.d/post.radius

    rdf958d5 r031ab69  
    77chmod 700 /home/system/radius
    88
     9#needed to create group
     10/sbin/postinst.sh post.openldap
     11svcstart /service/slapd/ 
     12
    913if ! ( getent group | grep "Windows VPN - pptp" &> /dev/null ) ; then
    1014 smbldap-groupadd -g 520 "Windows VPN - pptp" || exit 1;

  • npl/internetserver/openvpn/openvpn.SlackBuild

    rdf958d5 r031ab69  
    5353#export CFLAGS="-fgnu89-inline" #If "multiple definition of `foo'" Also see http://gcc.gnu.org/gcc-4.3/porting_to.html
    5454MAKE_OPTS=""
     55autoreconf -i -v -f || exit 1
    5556./configure --prefix=/usr  || exit 1
    5657

  • npl/internetserver/openvpn/openvpn.md5

    rdf958d5 r031ab69  
    1 5797885e15c48fd9ef1c7fde7552aed5  ./openvpn-2.3.14.tar.gz
    2 9ec4d9ce81c6f57d2c8449fbb8c3323f  ./openvpn_dev.pkg
    3 dacffff2e31b9a9fc600a736867012f2  ./openvpn.pkg
    4 259216217a81affa926a650cc3172990  ./openvpn.SlackBuild
    5 f9e389fe29cae0015c8b78fcad305b4c  ./openvpn.SlackBuild.log.gz
     19fe8ad5ac2f5f5b8feb7828a8edd1aec  ./openvpn-2.3.18.tar.gz
     2af2b55ef539039c7abc0bb9c6602d565  ./openvpn_dev.pkg
     33224fc56ba75c502947bf48e8752982d  ./openvpn.pkg
     43a5786293ac155e67653e52e9f428df1  ./openvpn.SlackBuild
     5563195c2aad60e1f29fce0fed417816c  ./openvpn.SlackBuild.log.gz

  • npl/internetserver/openvpn/openvpn.version

    rdf958d5 r031ab69  
    1 2.3.14
     12.3.18

  • npl/internetserver/openvpn/openvpn_dev.version

    rdf958d5 r031ab69  
    1 2.3.14
     12.3.18

  • npl/internetserver/openvpn_conf/openvpn_conf.build

    rdf958d5 r031ab69  
    1 6558
     16560

  • npl/internetserver/openvpn_conf/openvpn_conf.md5

    rdf958d5 r031ab69  
    1 e6b8830262387e5096021399e73eacfe  ./openvpn_conf.pkg
     1c944c634d7d393d656a8bc72981d857d  ./openvpn_conf.pkg
    22729b418d4c2197708760319d4097906e  ./openvpn_conf.SlackBuild
    3 30b7d6e39f812d1cca79c92ee2d8f014  ./openvpn_conf.SlackBuild.log.gz
     39642ef78f7a58f409156e4e23271ae51  ./openvpn_conf.SlackBuild.log.gz
    4402590f2d27b9254da5877e03719a9228  ./root/etc/firewall/services.openvpn
    555d08314120a94191e539c792b1c410a2  ./root/etc/openvpn/easyrsa
    … …  
    1818d0d7a06379af67505bf5dae59d3e7afb  ./root/etc/openvpn/x509-types/server
    1919c8fadda104656594f3ceadbb13d9d178  ./root/etc/pam.d/openvpn
    20 0b5c1be62a06a25f07bb7360014c82e7  ./root/etc/postinst.d/post.openvpn
    21 b4cd1c6ab389a60ed98da6d792339fa7  ./root/service/openvpn/run
     20a6e8a68a743fe6448c01ccba1db33569  ./root/service/openvpn/run

  • npl/internetserver/openvpn_conf/root/service/openvpn/run

    rdf958d5 r031ab69  
    11#!/bin/bash
     2
     3set -e
     4
     5cd /etc/openvpn
     6
     7# key generation moved here, otherwise it takes too long (now the system is generating more entrophy because it continues to start)
     8
     9
     10#basic setup
     11if ! [ -e pki ]; then
     12        ./easyrsa init-pki
     13fi
     14
     15#create ca cert
     16if ! [ -e pki/ca.crt ]; then
     17        echo syn3 | ./easyrsa build-ca nopass
     18fi
     19
     20#create server cert
     21if ! [ -e pki/issued/server.crt ]; then
     22        ./easyrsa build-server-full server nopass
     23fi
     24
     25#create dh parameters
     26if ! [ -e pki/dh.pem ]; then
     27        ./easyrsa gen-dh
     28fi
     29
     30#create CRL list
     31if ! [ -e pki/crl.pem ]; then
     32        ./easyrsa gen-crl
     33fi
     34
     35#openvpn group
     36if ! ( getent group | grep "OpenVPN access" &> /dev/null ) ; then
     37 smbldap-groupadd -g 521 "OpenVPN access" || exit 1;
     38fi
     39
     40#openvpn ipblock
     41NAME="OpenVPN clients"
     42if ! grep "$NAME" /etc/firewall/ipblocks; then
     43        echo "$NAME='10.8.0.0/24'" >> /etc/firewall/ipblocks
     44fi
     45
     46#create tlsauth key
     47if ! [ -e pki/ta.key ]; then
     48        openvpn --genkey --secret pki/ta.key
     49fi
     50
    251
    352modprobe tun
    453
    5 cd /etc/openvpn
    654exec openvpn --config openvpn.conf --config openvpn_syn3.conf  --config openvpn_custom.conf

  • npl/monitoring/zabbix_conf/root/etc/postinst.d/post.zabbix

    rdf958d5 r031ab69  
    1010fi
    1111
     12#first time installation?
     13if [ `ls /var/log/packages/zabbix_conf-* 2>/dev/null|wc -l` == "1" ]; then
     14        #make sure its disabled
     15        touch /service/zabbix/down
     16        svcstop /service/zabbix
     17fi
     18
     19
     20
    1221exit 0

  • npl/monitoring/zabbix_conf/zabbix_conf.build

    rdf958d5 r031ab69  
    1 6253
     16254

  • npl/monitoring/zabbix_conf/zabbix_conf.md5

    rdf958d5 r031ab69  
    1 b105fd350cde737ebc116f20b21e8aa1  ./root/etc/postinst.d/post.zabbix
    2 bcececeaf6432b0d2ea116fe17db550c  ./root/etc/zabbix/zabbix_agentd.conf
     1e6f6fca6d909beef50747f18fa001f45  ./root/etc/postinst.d/post.zabbix
     2bcececeaf6432b0d2ea116fe17db550c  ./root/etc/zabbix/zabbix_agentd.conf.new
    3337644f11a86f706c8ef6bf2ae820a32e  ./root/sbin/syn3-zabbix-send
    44ab4022685a3c70817da61f1859e03dfd  ./root/service/zabbix/run
    5 c607cf858086ff08df8293395767870d  ./zabbix_conf.pkg
     582d1aad9ee0822f3c9fa2262474753a5  ./zabbix_conf.pkg
    6693359115e059b20b027eaab38085b3d8  ./zabbix_conf.SlackBuild
    7 ad33bcbe658ccbd1c52fad51f675ee49  ./zabbix_conf.SlackBuild.log.gz
     7b6a17a6a5bdc8c018a5cee7b31b3437d  ./zabbix_conf.SlackBuild.log.gz
Note: See TracChangeset for help on using the changeset viewer.