diff --git a/Makefile b/Makefile index 4a332d0..017e454 100644 --- a/Makefile +++ b/Makefile @@ -91,6 +91,7 @@ var: @printf "$(GREEN)--- var ------------------------------------------------\n$(RESET)" git submodule update --remote --init -- var/tilde/admins stow -t /var var + @cp -f /var/tilde/admins/raw/banned_emails.txt /var @chown -R www-data:root /var/signups* /var/banned_emails.txt @chmod 600 /var/signups* /var/banned_emails.txt diff --git a/etc/cron.d/tilde_admin b/etc/cron.d/tilde_admin index 766f18f..2a76bdf 100644 --- a/etc/cron.d/tilde_admin +++ b/etc/cron.d/tilde_admin @@ -3,5 +3,6 @@ # SHELL=/bin/sh PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +MAILTO="" -0 0 * * * root cd /var/tilde/admins/ && git pull >/dev/null 2>&1 +0 0 * * * root cd /var/tilde/admins/ && git pull origin master; cp raw/banned_emails.txt /var diff --git a/var/banned_emails.txt b/var/banned_emails.txt deleted file mode 120000 index 4bdbc4c..0000000 --- a/var/banned_emails.txt +++ /dev/null @@ -1 +0,0 @@ -tilde/admins/raw/banned_emails.txt \ No newline at end of file diff --git a/var/signups_forbidden b/var/signups_forbidden index a7eb4bb..d603de8 100644 --- a/var/signups_forbidden +++ b/var/signups_forbidden @@ -63,4 +63,3 @@ webmaster wpad www znc -dd