experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vagrant updates

Browse source
This commit is contained in:
Olof Hagsand 2020-10-18 15:22:50 +00:00
parent e176330a74
commit 85f069fa8a
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/vagrant/README.md
View file

@ -25,7 +25,7 @@ You can also run a single vagrant test as follows:
The current vagrant boxes are verified continuously: The current vagrant boxes are verified continuously:
* ubuntu/bionic64 * ubuntu/bionic64
* generic/centos8 * generic/centos8
* freebsd/FreeBSD-12.1-STABLE * generic/freebsd12
For other vagrant boxes, see [search vagrant boxes](https://vagrantcloud.com/search) For other vagrant boxes, see [search vagrant boxes](https://vagrantcloud.com/search)

3
test/vagrant/clixon.sh
View file

@ -39,6 +39,9 @@ git pull
if [ $release = "freebsd" ]; then if [ $release = "freebsd" ]; then
./configure ./configure
MAKE=$(which gmake) MAKE=$(which gmake)
elif [ $release = "arch" ]; then
./configure --prefix=/usr
MAKE=/usr/bin/make
else else
./configure --prefix=/usr ./configure --prefix=/usr
MAKE=$(which make) MAKE=$(which make)

18
test/vagrant/vagrant.sh
View file

@ -139,7 +139,7 @@ case $release in
$sshcmd sudo useradd -M $wwwuser $sshcmd sudo useradd -M $wwwuser
fi fi
# packages for building # packages for building
$sshcmd sudo yum install -y git $sshcmd sudo yum install -y git make
# cligen # cligen
$sshcmd sudo yum install -y bison flex $sshcmd sudo yum install -y bison flex
# clixon utilities # clixon utilities
@ -182,6 +182,7 @@ case $release in
esac esac
;; ;;
ubuntu) # ubuntu/apt based ubuntu) # ubuntu/apt based
$sshcmd sudo apt-get update --fix-missing
$sshcmd sudo apt install -y git $sshcmd sudo apt install -y git
# restconf user: $wwwuser # restconf user: $wwwuser
if [ ! $($sshcmd id -u $wwwuser) ]; then if [ ! $($sshcmd id -u $wwwuser) ]; then
@ -199,10 +200,9 @@ case $release in
$sshcmd sudo apt install -y nginx $sshcmd sudo apt install -y nginx
;; ;;
evhtp) evhtp)
$sshcmd sudo apt install -y libevent-2.1 # $sshcmd sudo apt install -y libevent-2.1
buildevhtp=true buildevhtp=true
$sshcmd sudo apt install -y libevent-dev cmake libssl-dev $sshcmd sudo apt install -y libevent-dev cmake libssl-dev
;; ;;
esac esac
;; ;;
@ -211,7 +211,6 @@ case $release in
$sshcmd sudo adduser -D -H $wwwuser $sshcmd sudo adduser -D -H $wwwuser
fi fi
$sshcmd sudo apk add --update git make build-base gcc flex bison curl-dev g++ $sshcmd sudo apk add --update git make build-base gcc flex bison curl-dev g++
# restconf # restconf
case ${with_restconf} in case ${with_restconf} in
fcgi) fcgi)
@ -222,13 +221,18 @@ case $release in
esac esac
;; ;;
arch) arch)
$sshcmd sudo pacman -S --noconfirm git $sshcmd sudo useradd -M $wwwuser
useradd -m -G additional_groups -s login_shell username
$sshcmd sudo pacman -Syu --noconfirm git
# cligen
$sshcmd sudo pacman -Syu --noconfirm bison flex make
# restconf # restconf
case ${with_restconf} in case ${with_restconf} in
fcgi) fcgi)
$sshcmd sudo pacman -S --noconfirm nginx fcgi $sshcmd sudo pacman -Syu --noconfirm nginx fcgi
;; ;;
evhtp) evhtp)
$sshcmd sudo pacman -Syu --noconfirm libevent cmake
;; ;;
esac esac
;; ;;
@ -262,7 +266,7 @@ case ${with_restconf} in
test -d libevhtp || sudo git clone https://github.com/criticalstack/libevhtp.git test -d libevhtp || sudo git clone https://github.com/criticalstack/libevhtp.git
cd libevhtp/build; cd libevhtp/build;
CMAKE=$(which cmake) CMAKE=$(which cmake)
sudo $CMAKE -DEVHTP_DISABLE_REGEX=ON -DEVHTP_DISABLE_EVTHR=ON .. sudo $CMAKE -DEVHTP_DISABLE_REGEX=ON -DEVHTP_DISABLE_EVTHR=ON -DBUILD_SHARED_LIBS=OFF ..
sudo make sudo make
sudo make install sudo make install
EOF EOF