swapon /swapfile
echo "/swapfile swap swap auto 0 0" | tee -a /etc/fstab
sysctl -w vm.swappiness=10
- echo vm.swappiness = 10 | tee -a /etc/sysctl.conf
+ echo 'vm.swappiness = 10' > /etc/sysctl.d/30-discourse-swap.conf
total_swap=`free -g --si | awk ' /Swap:/ {print $2} '`
if [ "$total_swap" -lt 2 ]; then
##
read_config() {
config_line=`egrep "^ #?$1:" $web_file`
- read_config_result=`echo $config_line | awk --field-separator=":" '{print $2}'`
+ read_config_result=`echo $config_line | awk -F":" '{print $2}'`
read_config_result=`echo $read_config_result | sed "s/^\([\"']\)\(.*\)\1\$/\2/g"`
}
-
+read_default() {
+ config_line=`egrep "^ #?$1:" samples/standalone.yml`
+ read_default_result=`echo $config_line | awk -F":" '{print $2}'`
+ read_default_result=`echo $read_config_result | sed "s/^\([\"']\)\(.*\)\1\$/\2/g"`
+}
##
## prompt user for typical Discourse config file values
while [[ "$config_ok" == "n" ]]
do
- if [ ! -z $hostname ]
+ if [ ! -z "$hostname" ]
then
read -p "Hostname for your Discourse? [$hostname]: " new_value
if [ ! -z "$new_value" ]
fi
fi
- if [ ! -z $developer_emails ]
+ if [ ! -z "$developer_emails" ]
then
read -p "Email address for admin account(s)? [$developer_emails]: " new_value
if [ ! -z "$new_value" ]
fi
fi
- if [ ! -z $smtp_address ]
+ if [ ! -z "$smtp_address" ]
then
read -p "SMTP server address? [$smtp_address]: " new_value
if [ ! -z "$new_value" ]
fi
fi
- if [ ! -z $smtp_port ]
+ if [ ! -z "$smtp_port" ]
then
read -p "SMTP port? [$smtp_port]: " new_value
if [ ! -z "$new_value" ]
if [ ! -z $letsencrypt_account_email ]
then
- read -p "Let's Encrypt account email? ($letsencrypt_status) [$letsencrypt_account_email]: " new_value
+ read -p "Optional email address for setting up Let's Encrypt? ($letsencrypt_status) [$letsencrypt_account_email]: " new_value
if [ ! -z "$new_value" ]
then
letsencrypt_account_email="$new_value"
for x in DISCOURSE_SMTP_ADDRESS DISCOURSE_SMTP_USER_NAME DISCOURSE_SMTP_PASSWORD \
DISCOURSE_DEVELOPER_EMAILS DISCOURSE_HOSTNAME
do
- config_line=`grep "^ $x:" $web_file`
- local result=$?
- local default="example.com"
+ read_config $x
+ local result=$read_config_result
+ read_default $x
+ local default=$read_default_result
- if (( result == 0 ))
+ if [ ! -z "$result" ]
then
if [[ "$config_line" = *"$default"* ]]
then
- echo "$x left at incorrect default of example.com"
+ echo "$x left at incorrect default of $default"
valid_config="n"
fi
config_val=`echo $config_line | awk '{print $2}'`
if [ -z $config_val ]
then
- echo "$x was left blank"
+ echo "$x was not configured"
valid_config="n"
fi
else