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

vagrant fcgi etc

Browse source
This commit is contained in:
Olof Hagsand 2020-06-16 07:29:11 +00:00
parent 718f494549
commit c61c489e8e
3 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/vagrant/README.md
View file

@ -13,6 +13,8 @@ in a "site.mk" file. You can add such a file, eg:
VAGRANTS += generic/centos8 VAGRANTS += generic/centos8
``` ```
Beware memory exhaustion if you run too many simultaneously.
Logs appear in : <dir>/<hostname>.log. Logs appear in : <dir>/<hostname>.log.
You can also run a single vagrant test as follows: You can also run a single vagrant test as follows:
@ -22,8 +24,8 @@ You can also run a single vagrant test as follows:
The current status is as follows The current status is as follows
* freebsd/FreeBSD-12.1-STABLE * freebsd/FreeBSD-12.1-STABLE
* generic/centos8 - some remaining nginx issue * generic/opensuse42
* generic/opensuse42 - fastcgi is not installed * generic/centos8 - one state test fails
For other vagrant boxes, see [search vagrant boxes](https://vagrantcloud.com/search) For other vagrant boxes, see [search vagrant boxes](https://vagrantcloud.com/search)

2
test/vagrant/nginx.sh
View file

@ -84,7 +84,7 @@ cat<<'EOF' > $dir/startnginx.sh
sudo /usr/local/etc/rc.d/nginx restart sudo /usr/local/etc/rc.d/nginx restart
else else
sudo pkill nginx sudo pkill nginx
nginxbin=$(which nginx) nginxbin=$(sudo which nginx)
sudo $nginxbin -c $prefix/etc/nginx/nginx.conf sudo $nginxbin -c $prefix/etc/nginx/nginx.conf
fi fi
EOF EOF

40
test/vagrant/vagrant.sh
View file

@ -60,6 +60,7 @@ echo "$sshcmd"
system=$($sshcmd uname) system=$($sshcmd uname)
buildfcgi=false
case $system in case $system in
FreeBSD) FreeBSD)
# packages for building # packages for building
@ -73,26 +74,41 @@ case $system in
$sshcmd sudo pkg install -y fcgi-devkit nginx $sshcmd sudo pkg install -y fcgi-devkit nginx
;; ;;
Linux) Linux)
# nginx restconf user: $wwwuser
if [ ! $($sshcmd id -u $wwwuser) ]; then
$sshcmd sudo useradd -M $wwwuser
fi
case $release in case $release in
centos) # centos 8 centos) # centos 8
# packages for building # packages for building
$sshcmd sudo yum install -y git $sshcmd sudo yum install -y git
# cligen # cligen
$sshcmd sudo yum install -y bison flex $sshcmd sudo yum install -y bison flex
# clixon # clixon
if [ ! $($sshcmd id -u $wwwuser) ]; then
$sshcmd sudo useradd -M $wwwuser
fi
$sshcmd sudo yum install -y fcgi-devel nginx $sshcmd sudo yum install -y fcgi-devel nginx
# clixon utilities # clixon utilities
$sshcmd sudo yum install -y libcurl-devel $sshcmd sudo yum install -y libcurl-devel
;; ;;
opensuse) # opensuse42 opensuse) # opensuse42
# packages for building
$sshcmd sudo zypper install -y git
# cligen
$sshcmd sudo zypper install -y bison flex
# clixon # clixon
$sshcmd sudo zypper install -y nginx $sshcmd sudo zypper install -y nginx
# XXX: no fastcgi package? buildfcgi=true # build fcgi from source
# clixon utilities
$sshcmd sudo zypper install -y libcurl-devel
# packages for building fcgi
$sshcmd sudo zypper install -y autoconf automake libtool
;; ;;
*) *) # ubuntu/apt based
# cligen
$sshcmd sudo apt install -y bison flex
# clixon
$sshcmd sudo apt install -y libfcgi-dev nginx
# clixon utilities
$sshcmd sudo apt install -y libcurl4-openssl-dev
;; ;;
esac esac
;; ;;
@ -101,6 +117,12 @@ case $system in
;; ;;
esac esac
# Some platforms dont have fcgi, build the source (should all?)
if $buildfcgi; then
$sshcmd "test -d fcgi2 || git clone https://github.com/FastCGI-Archives/fcgi2"
$sshcmd "(cd fcgi2; ./autogen.sh; ./configure; make; sudo make install)"
fi
# Hide all complex nginx config in sub-script # Hide all complex nginx config in sub-script
. ./nginx.sh $dir $idfile $port $wwwuser . ./nginx.sh $dir $idfile $port $wwwuser
@ -121,11 +143,11 @@ wwwuser=$2
if [ ! $(id -u clicon) ]; then if [ ! $(id -u clicon) ]; then
if [ $release = "freebsd" ]; then if [ $release = "freebsd" ]; then
sudo pw useradd clicon -d /nonexistent -s /usr/sbin/nologin; sudo pw useradd clicon -d /nonexistent -s /usr/sbin/nologin;
sudo pw group mod clicon -m vagrant; sudo pw group mod clicon -m vagrant; # start clixon tests as this users
sudo pw group mod clicon -m $wwwuser; sudo pw group mod clicon -m $wwwuser;
else else
sudo useradd clicon; sudo useradd -M -U clicon;
sudo usermod -a -G clicon vagrant; sudo usermod -a -G clicon vagrant; # start clixon tests as this users
sudo usermod -a -G clicon $wwwuser; sudo usermod -a -G clicon $wwwuser;
fi fi
fi fi