Project name
This commit is contained in:
parent
2db820daa0
commit
9ce622b5bd
|
@ -257,7 +257,7 @@ if grep -q "Blog domain" $COMPLETION_FILE; then
|
|||
userdel -r $MY_USERNAME
|
||||
exit 9
|
||||
fi
|
||||
NEW_USER_PASSWORD_HASH=$(freedombone-sec --bloghash "$NEW_USER_PASSWORD")
|
||||
NEW_USER_PASSWORD_HASH=$(${PROJECT_NAME}-sec --bloghash "$NEW_USER_PASSWORD")
|
||||
if [ ${#NEW_USER_PASSWORD_HASH} -lt 8 ]; then
|
||||
echo $'Blog admin password could not be hashed'
|
||||
exit 783528
|
||||
|
@ -293,7 +293,7 @@ if grep -q "install_gnusocial" $COMPLETION_FILE; then
|
|||
if [ -d /var/www/$MICROBLOG_DOMAIN_NAME ]; then
|
||||
cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
|
||||
php scripts/registeruser.php -n $MY_USERNAME -w "$NEW_USER_PASSWORD" -e "$MY_USERNAME@$HOSTNAME"
|
||||
freedombone-addemail -u $MY_USERNAME -e "noreply@$MICROBLOG_DOMAIN_NAME" -g gnusocial --public no
|
||||
${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$MICROBLOG_DOMAIN_NAME" -g gnusocial --public no
|
||||
echo $'Created GNU Social user'
|
||||
else
|
||||
echo $"Unable to find GNU Social installation at /var/www/$MICROBLOG_DOMAIN_NAME/htdocs"
|
||||
|
|
|
@ -324,7 +324,7 @@ function install_blog {
|
|||
fi
|
||||
|
||||
# create a user
|
||||
FULLBLOG_ADMIN_PASSWORD_HASH=$(freedombone-sec --bloghash "$FULLBLOG_ADMIN_PASSWORD")
|
||||
FULLBLOG_ADMIN_PASSWORD_HASH=$(${PROJECT_NAME}-sec --bloghash "$FULLBLOG_ADMIN_PASSWORD")
|
||||
if [ ${#FULLBLOG_ADMIN_PASSWORD_HASH} -lt 8 ]; then
|
||||
echo $'Blog admin password could not be hashed'
|
||||
exit 625728
|
||||
|
|
|
@ -337,7 +337,7 @@ function install_gnusocial_main {
|
|||
systemctl restart php5-fpm
|
||||
systemctl restart nginx
|
||||
|
||||
freedombone-addemail -u $MY_USERNAME -e "noreply@$MICROBLOG_DOMAIN_NAME" -g gnusocial --public no
|
||||
${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$MICROBLOG_DOMAIN_NAME" -g gnusocial --public no
|
||||
|
||||
# some post-install instructions for the user
|
||||
if ! grep -q $"Microblog administrator" /home/$MY_USERNAME/README; then
|
||||
|
|
|
@ -402,7 +402,7 @@ function install_hubzilla {
|
|||
systemctl restart nginx
|
||||
systemctl restart cron
|
||||
|
||||
freedombone-addemail -u $MY_USERNAME -e "noreply@$HUBZILLA_DOMAIN_NAME" -g hubzilla --public no
|
||||
${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$HUBZILLA_DOMAIN_NAME" -g hubzilla --public no
|
||||
|
||||
echo "Hubzilla domain:${HUBZILLA_DOMAIN_NAME}" >> $COMPLETION_FILE
|
||||
echo 'install_hubzilla' >> $COMPLETION_FILE
|
||||
|
|
|
@ -54,7 +54,7 @@ function remove_syncthing {
|
|||
systemctl disable syncthing
|
||||
apt-get -y remove --purge syncthing
|
||||
rm /etc/systemd/system/syncthing.service
|
||||
sed -i '/freedombone-syncthing/d' /etc/crontab
|
||||
sed -i "/${PROJECT_NAME}-syncthing/d" /etc/crontab
|
||||
sed -i '/install_syncthing/d' $COMPLETION_FILE
|
||||
sed -i '/configure_firewall_for_syncthing/d' $COMPLETION_FILE
|
||||
systemctl restart cron
|
||||
|
@ -111,7 +111,7 @@ function install_syncthing {
|
|||
systemctl start syncthing
|
||||
|
||||
function_check cron_add_mins
|
||||
cron_add_mins 1 '/usr/local/bin/freedombone-syncthing > /dev/null'
|
||||
cron_add_mins 1 "/usr/local/bin/${PROJECT_NAME}-syncthing > /dev/null"
|
||||
|
||||
function_check configure_firewall_for_syncthing
|
||||
configure_firewall_for_syncthing
|
||||
|
|
|
@ -979,7 +979,7 @@ function handle_admin_emails {
|
|||
return
|
||||
fi
|
||||
|
||||
freedombone-addemail -u $MY_USERNAME -e "root@$DEFAULT_DOMAIN_NAME" -g admin --public no
|
||||
${PROJECT_NAME}-addemail -u $MY_USERNAME -e "root@$DEFAULT_DOMAIN_NAME" -g admin --public no
|
||||
}
|
||||
|
||||
function spam_filtering {
|
||||
|
|
|
@ -2120,7 +2120,7 @@ function menu_top_level {
|
|||
|
||||
if [[ $USER != 'root' ]]; then
|
||||
# show the user version of the control panel
|
||||
freedombone-controlpanel-user
|
||||
${PROJECT_NAME}-controlpanel-user
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
|
|
@ -887,7 +887,7 @@ function menu_admin {
|
|||
clear
|
||||
exit 0
|
||||
fi
|
||||
sudo freedombone-controlpanel
|
||||
sudo ${PROJECT_NAME}-controlpanel
|
||||
}
|
||||
|
||||
function sign_keys {
|
||||
|
|
|
@ -1186,7 +1186,7 @@ function install_syncthing {
|
|||
chroot "$rootdir" systemctl daemon-reload
|
||||
|
||||
if ! grep -q "syncthing" $rootdir/etc/crontab; then
|
||||
chroot "$rootdir" echo "*/1 * * * * root /usr/local/bin/freedombone-syncthing > /dev/null" >> /etc/crontab
|
||||
chroot "$rootdir" echo "*/1 * * * * root /usr/local/bin/${PROJECT_NAME}-syncthing > /dev/null" >> /etc/crontab
|
||||
chroot "$rootdir" systemctl restart cron
|
||||
fi
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@ function zram_daemon {
|
|||
echo 'User=zram' >> $DAEMON_FILENAME
|
||||
echo 'Group=zram' >> $DAEMON_FILENAME
|
||||
echo 'WorkingDirectory=' >> $DAEMON_FILENAME
|
||||
echo "ExecStart=freedombone-zram on" >> $DAEMON_FILENAME
|
||||
echo "ExecStart=${PROJECT_NAME}-zram on" >> $DAEMON_FILENAME
|
||||
echo '' >> $DAEMON_FILENAME
|
||||
echo '[Install]' >> $DAEMON_FILENAME
|
||||
echo 'WantedBy=multi-user.target' >> $DAEMON_FILENAME
|
||||
|
|
Loading…
Reference in New Issue