msimerson / Mail-Toaster-6

Mail Toaster 6
https://github.com/msimerson/Mail-Toaster-6/wiki
BSD 3-Clause "New" or "Revised" License
46 stars 16 forks source link

provision rainloop broken - fix #509

Closed johannes73 closed 1 year ago

johannes73 commented 1 year ago

Expected behavior

provision rainloop

(...) Success! A new 'rainloop' jail is provisioned

Observed behavior

This jail does not provision as per October 24, 2022.

Steps to reproduce

provision rainloop

on FreeBSD 12.3.

Fix that got it working

Sorry, I am not the best att github pull requests, so here is the fix as a diff. I am not sure if all instances of "-community" have to be replaced with "", but at least, this works for me. The script after applying the diff can not be run with "provision rainloop"; instead use "sh provision/rainloop.sh".

# diff provision/rainloop.sh provision/rainloop.sh.fixed
18,19c18,19
<       stage_make_conf rainloop-community_SET 'mail_rainloop-community_SET=SQLITE'
<       stage_make_conf rainloop-community_UNSET 'mail_rainloop-community_UNSET=MYSQL PGSQL'
---
>       stage_make_conf rainloop_SET 'mail_rainloop_SET=SQLITE'
>       stage_make_conf rainloop_UNSET 'mail_rainloop_UNSET=MYSQL PGSQL'
23,24c23,24
<           stage_make_conf rainloop-community_SET 'mail_rainloop-community_SET=MYSQL'
<           stage_make_conf rainloop-community_UNSET 'mail_rainloop-community_UNSET=SQLITE PGSQL'
---
>           stage_make_conf rainloop_SET 'mail_rainloop_SET=MYSQL'
>           stage_make_conf rainloop_UNSET 'mail_rainloop_UNSET=SQLITE PGSQL'
32c32,36
<   stage_port_install mail/rainloop-community || exit
---
> 
>   #JohA
> # stage_port_install mail/rainloop-community || exit
>   stage_port_install mail/rainloop || exit
> 
115c119
<   _rl_ver="$(pkg -j stage info rainloop-community-php74 | grep Version | awk '{ print $3 }' | cut -f1 -d_)"
---
>   _rl_ver="$(pkg -j stage info rainloop-php74 | grep Version | awk '{ print $3 }' | cut -f1 -d_)"
160d163
< 
johannes73 commented 1 year ago

Thanks, Matt. You are the best. Kind regards,Johannes1 nov. 2022 kl. 21:41 skrev Matt Simerson @.***>: Closed #509 as completed via #514.

—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you authored the thread.Message ID: @.***>