kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

adding incron.d for alternc-ssl

This commit is contained in:
Benjamin Sonntag 2014-09-20 19:30:23 +02:00
parent da9791395d
commit 73b6ef9bd9
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -26,6 +26,10 @@ debian/alternc-upnp.substvars
debian/alternc.debhelper.log debian/alternc.debhelper.log
debian/alternc.postrm.debhelper debian/alternc.postrm.debhelper
debian/alternc.substvars debian/alternc.substvars
debian/alternc-ssl
debian/alternc-ssl.debhelper.log
debian/alternc-ssl.postrm.debhelper
debian/alternc-ssl.substvars
debian/files debian/files
lang/de_DE.po lang/de_DE.po
lang/es_ES.po lang/es_ES.po

2
ssl/Makefile
View File

@ -22,7 +22,7 @@ install:
install -m 0755 -g root -o root update_ssl.php $(DESTDIR)/usr/lib/alternc/ install -m 0755 -g root -o root update_ssl.php $(DESTDIR)/usr/lib/alternc/
# incron # incron
install -m 0755 -g root -o root ssl_alias_manager.sh $(DESTDIR)/usr/lib/alternc/ install -m 0755 -g root -o root ssl_alias_manager.sh $(DESTDIR)/usr/lib/alternc/
install -m 0644 -g root -o root install -m 0644 -g root -o root alternc-ssl.incron.d $(DESTDIR)/etc/incron.d/
install -m 0644 -g 1999 -o root panel/class/m_ssl.php $(DESTDIR)/usr/share/alternc/panel/class/ install -m 0644 -g 1999 -o root panel/class/m_ssl.php $(DESTDIR)/usr/share/alternc/panel/class/
install -m 0644 -g 1999 -o root panel/admin/*.php $(DESTDIR)/usr/share/alternc/panel/admin/ install -m 0644 -g 1999 -o root panel/admin/*.php $(DESTDIR)/usr/share/alternc/panel/admin/

1
ssl/alternc-ssl.incron.d Normal file
View File

@ -0,0 +1 @@
/var/run/alternc/generate_certif_alias IN_CREATE,IN_ATTRIB,IN_NO_LOOP /usr/lib/alternc/ssl_alias_manager.sh

5
ssl/panel/class/m_ssl.php
View File

@ -42,6 +42,7 @@ class m_ssl {
const FILTER_EXPIRED = 4; const FILTER_EXPIRED = 4;
const FILTER_SHARED = 8; const FILTER_SHARED = 8;
const SSL_INCRON_FILE = "/var/run/alternc/generate_certif_alias";
/* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */
/** /**
@ -424,7 +425,7 @@ class m_ssl {
return false; return false;
} }
$db->query("INSERT INTO certif_alias SET name='".addslashes($name)."', value='".addslashes($value)."', uid=".intval($cuid).";"); $db->query("INSERT INTO certif_alias SET name='".addslashes($name)."', value='".addslashes($value)."', uid=".intval($cuid).";");
touch("/tmp/generate_certif_alias"); touch(self::SSL_INCRON_FILE);
return true; return true;
} }
@ -444,7 +445,7 @@ class m_ssl {
return false; return false;
} }
$db->query("DELETE FROM certif_alias WHERE name='".addslashes($name)."' AND uid=".intval($cuid).";"); $db->query("DELETE FROM certif_alias WHERE name='".addslashes($name)."' AND uid=".intval($cuid).";");
touch("/tmp/generate_certif_alias"); touch(self::SSL_INCRON_FILE);
return true; return true;
} }

3
ssl/ssl_alias_manager.sh
View File

@ -1,7 +1,10 @@
#!/bin/bash #!/bin/bash
rm -f /var/run/alternc/generate_certif_alias
# Launched by incron when /tmp/generate_certif_alias exists # Launched by incron when /tmp/generate_certif_alias exists
# regenerate the list of global aliases used by Comodo for certificate ownership validation # regenerate the list of global aliases used by Comodo for certificate ownership validation
# FIXME: how do we lock that, ensuring we don't launch this more than once ?
APACHECONF=/etc/apache2/conf.d/alternc-ssl_cert-alias.conf APACHECONF=/etc/apache2/conf.d/alternc-ssl_cert-alias.conf
TMP=/tmp/alternc-ssl_cert-alias_${$}.tmp TMP=/tmp/alternc-ssl_cert-alias_${$}.tmp
FILEDIR=/var/lib/alternc/ssl-cert-alias FILEDIR=/var/lib/alternc/ssl-cert-alias