Browse Source

Project name

Bob Mottram 9 years ago
parent
commit
9ce622b5bd
No account linked to committer's email

+ 2
- 2
src/freedombone-adduser View File

257
 		userdel -r $MY_USERNAME
257
 		userdel -r $MY_USERNAME
258
 		exit 9
258
 		exit 9
259
 	fi
259
 	fi
260
-	NEW_USER_PASSWORD_HASH=$(freedombone-sec --bloghash "$NEW_USER_PASSWORD")
260
+	NEW_USER_PASSWORD_HASH=$(${PROJECT_NAME}-sec --bloghash "$NEW_USER_PASSWORD")
261
 	if [ ${#NEW_USER_PASSWORD_HASH} -lt 8 ]; then
261
 	if [ ${#NEW_USER_PASSWORD_HASH} -lt 8 ]; then
262
 		echo $'Blog admin password could not be hashed'
262
 		echo $'Blog admin password could not be hashed'
263
 		exit 783528
263
 		exit 783528
293
 	if [ -d /var/www/$MICROBLOG_DOMAIN_NAME ]; then
293
 	if [ -d /var/www/$MICROBLOG_DOMAIN_NAME ]; then
294
 		cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
294
 		cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
295
 		php scripts/registeruser.php -n $MY_USERNAME -w "$NEW_USER_PASSWORD" -e "$MY_USERNAME@$HOSTNAME"
295
 		php scripts/registeruser.php -n $MY_USERNAME -w "$NEW_USER_PASSWORD" -e "$MY_USERNAME@$HOSTNAME"
296
-		freedombone-addemail -u $MY_USERNAME -e "noreply@$MICROBLOG_DOMAIN_NAME" -g gnusocial --public no
296
+		${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$MICROBLOG_DOMAIN_NAME" -g gnusocial --public no
297
 		echo $'Created GNU Social user'
297
 		echo $'Created GNU Social user'
298
 	else
298
 	else
299
 		echo $"Unable to find GNU Social installation at /var/www/$MICROBLOG_DOMAIN_NAME/htdocs"
299
 		echo $"Unable to find GNU Social installation at /var/www/$MICROBLOG_DOMAIN_NAME/htdocs"

+ 1
- 1
src/freedombone-app-blog View File

324
 	fi
324
 	fi
325
 
325
 
326
 	# create a user
326
 	# create a user
327
-	FULLBLOG_ADMIN_PASSWORD_HASH=$(freedombone-sec --bloghash "$FULLBLOG_ADMIN_PASSWORD")
327
+	FULLBLOG_ADMIN_PASSWORD_HASH=$(${PROJECT_NAME}-sec --bloghash "$FULLBLOG_ADMIN_PASSWORD")
328
 	if [ ${#FULLBLOG_ADMIN_PASSWORD_HASH} -lt 8 ]; then
328
 	if [ ${#FULLBLOG_ADMIN_PASSWORD_HASH} -lt 8 ]; then
329
 		echo $'Blog admin password could not be hashed'
329
 		echo $'Blog admin password could not be hashed'
330
 		exit 625728
330
 		exit 625728

+ 1
- 1
src/freedombone-app-gnusocial View File

337
 	systemctl restart php5-fpm
337
 	systemctl restart php5-fpm
338
 	systemctl restart nginx
338
 	systemctl restart nginx
339
 
339
 
340
-	freedombone-addemail -u $MY_USERNAME -e "noreply@$MICROBLOG_DOMAIN_NAME" -g gnusocial --public no
340
+	${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$MICROBLOG_DOMAIN_NAME" -g gnusocial --public no
341
 
341
 
342
 	# some post-install instructions for the user
342
 	# some post-install instructions for the user
343
 	if ! grep -q $"Microblog administrator" /home/$MY_USERNAME/README; then
343
 	if ! grep -q $"Microblog administrator" /home/$MY_USERNAME/README; then

+ 1
- 1
src/freedombone-app-hubzilla View File

402
 	systemctl restart nginx
402
 	systemctl restart nginx
403
 	systemctl restart cron
403
 	systemctl restart cron
404
 
404
 
405
-	freedombone-addemail -u $MY_USERNAME -e "noreply@$HUBZILLA_DOMAIN_NAME" -g hubzilla --public no
405
+	${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$HUBZILLA_DOMAIN_NAME" -g hubzilla --public no
406
 
406
 
407
 	echo "Hubzilla domain:${HUBZILLA_DOMAIN_NAME}" >> $COMPLETION_FILE
407
 	echo "Hubzilla domain:${HUBZILLA_DOMAIN_NAME}" >> $COMPLETION_FILE
408
 	echo 'install_hubzilla' >> $COMPLETION_FILE
408
 	echo 'install_hubzilla' >> $COMPLETION_FILE

+ 2
- 2
src/freedombone-app-syncthing View File

54
 	systemctl disable syncthing
54
 	systemctl disable syncthing
55
 	apt-get -y remove --purge syncthing
55
 	apt-get -y remove --purge syncthing
56
 	rm /etc/systemd/system/syncthing.service
56
 	rm /etc/systemd/system/syncthing.service
57
-	sed -i '/freedombone-syncthing/d' /etc/crontab
57
+	sed -i "/${PROJECT_NAME}-syncthing/d" /etc/crontab
58
 	sed -i '/install_syncthing/d' $COMPLETION_FILE
58
 	sed -i '/install_syncthing/d' $COMPLETION_FILE
59
 	sed -i '/configure_firewall_for_syncthing/d' $COMPLETION_FILE
59
 	sed -i '/configure_firewall_for_syncthing/d' $COMPLETION_FILE
60
 	systemctl restart cron
60
 	systemctl restart cron
111
 	systemctl start syncthing
111
 	systemctl start syncthing
112
 
112
 
113
 	function_check cron_add_mins
113
 	function_check cron_add_mins
114
-	cron_add_mins 1 '/usr/local/bin/freedombone-syncthing > /dev/null'
114
+	cron_add_mins 1 "/usr/local/bin/${PROJECT_NAME}-syncthing > /dev/null"
115
 
115
 
116
 	function_check configure_firewall_for_syncthing
116
 	function_check configure_firewall_for_syncthing
117
 	configure_firewall_for_syncthing
117
 	configure_firewall_for_syncthing

+ 1
- 1
src/freedombone-base-email View File

979
 		return
979
 		return
980
 	fi
980
 	fi
981
 
981
 
982
-	freedombone-addemail -u $MY_USERNAME -e "root@$DEFAULT_DOMAIN_NAME" -g admin --public no
982
+	${PROJECT_NAME}-addemail -u $MY_USERNAME -e "root@$DEFAULT_DOMAIN_NAME" -g admin --public no
983
 }
983
 }
984
 
984
 
985
 function spam_filtering {
985
 function spam_filtering {

+ 1
- 1
src/freedombone-controlpanel View File

2120
 
2120
 
2121
 if [[ $USER != 'root' ]]; then
2121
 if [[ $USER != 'root' ]]; then
2122
 	# show the user version of the control panel
2122
 	# show the user version of the control panel
2123
-	freedombone-controlpanel-user
2123
+	${PROJECT_NAME}-controlpanel-user
2124
 	exit 0
2124
 	exit 0
2125
 fi
2125
 fi
2126
 
2126
 

+ 1
- 1
src/freedombone-controlpanel-user View File

887
 		clear
887
 		clear
888
 		exit 0
888
 		exit 0
889
 	fi
889
 	fi
890
-	sudo freedombone-controlpanel
890
+	sudo ${PROJECT_NAME}-controlpanel
891
 }
891
 }
892
 
892
 
893
 function sign_keys {
893
 function sign_keys {

+ 1
- 1
src/freedombone-image-customise View File

1186
 	chroot "$rootdir" systemctl daemon-reload
1186
 	chroot "$rootdir" systemctl daemon-reload
1187
 
1187
 
1188
 	if ! grep -q "syncthing" $rootdir/etc/crontab; then
1188
 	if ! grep -q "syncthing" $rootdir/etc/crontab; then
1189
-		chroot "$rootdir" echo "*/1            * *   *   *   root /usr/local/bin/freedombone-syncthing > /dev/null" >> /etc/crontab
1189
+		chroot "$rootdir" echo "*/1            * *   *   *   root /usr/local/bin/${PROJECT_NAME}-syncthing > /dev/null" >> /etc/crontab
1190
 		chroot "$rootdir" systemctl restart cron
1190
 		chroot "$rootdir" systemctl restart cron
1191
 	fi
1191
 	fi
1192
 
1192
 

+ 1
- 1
src/freedombone-zram View File

45
   echo 'User=zram' >> $DAEMON_FILENAME
45
   echo 'User=zram' >> $DAEMON_FILENAME
46
   echo 'Group=zram' >> $DAEMON_FILENAME
46
   echo 'Group=zram' >> $DAEMON_FILENAME
47
   echo 'WorkingDirectory=' >> $DAEMON_FILENAME
47
   echo 'WorkingDirectory=' >> $DAEMON_FILENAME
48
-  echo "ExecStart=freedombone-zram on" >> $DAEMON_FILENAME
48
+  echo "ExecStart=${PROJECT_NAME}-zram on" >> $DAEMON_FILENAME
49
   echo '' >> $DAEMON_FILENAME
49
   echo '' >> $DAEMON_FILENAME
50
   echo '[Install]' >> $DAEMON_FILENAME
50
   echo '[Install]' >> $DAEMON_FILENAME
51
   echo 'WantedBy=multi-user.target' >> $DAEMON_FILENAME
51
   echo 'WantedBy=multi-user.target' >> $DAEMON_FILENAME