SSL massive backport

* Now we integrate all alternc-feature in native alternc
* Files are backported as waiting by alternc
* Some files was renammed or moved to follow alternc installation
process

Makefile

@@ -34,7 +34,7 @@ install:
 install-common:
 # Shell Scripts
 	test -d $(DESTDIR)/usr/lib/alternc || mkdir -p $(DESTDIR)/usr/lib/alternc
-	cp src/* $(DESTDIR)/usr/lib/alternc/
+	cp -r src/* $(DESTDIR)/usr/lib/alternc/
 	chown root:root $(DESTDIR)/usr/lib/alternc/*
 	chmod 755 $(DESTDIR)/usr/lib/alternc/*
 
@@ -69,6 +69,15 @@ install-alternc: install-common
 # Man pages
 	install -o root -g root -m 644 man/*.8 $(DESTDIR)/usr/share/man/man8/
 
+#SSL functions
+	ln -s hosting_vhost-ssl.sh $(DESTDIR)/etc/alternc/functions_hosting/hosting_panel-ssl.sh
+	ln -s hosting_vhost-ssl.sh $(DESTDIR)/etc/alternc/functions_hosting/hosting_vhost-mixssl.sh
+	ln -s hosting_vhost-ssl.sh $(DESTDIR)/etc/alternc/functions_hosting/hosting_roundcube-ssl.sh
+	ln -s hosting_vhost-ssl.sh $(DESTDIR)/etc/alternc/functions_hosting/hosting_squirrelmail-ssl.sh
+	ln -s hosting_vhost-ssl.sh $(DESTDIR)/etc/alternc/functions_hosting/hosting_php52-ssl.sh
+	ln -s hosting_vhost-ssl.sh $(DESTDIR)/etc/alternc/functions_hosting/hosting_php52-mixssl.sh
+	ln -s hosting_vhost-ssl.sh $(DESTDIR)/etc/alternc/functions_hosting/hosting_url-ssl.sh
+
 install-slave: install-common
 # Man pages
 	pod2man --center "" --date "" --release "AlternC" --section=8 man/alternc.install.pod >$(DESTDIR)/usr/share/man/man8/alternc.install.8

bureau/admin/styles/style.css

@@ -1022,6 +1022,13 @@ div.progress-bar div.txt {
   padding-left: 30px;
 }
 
+.ssl a, a.ssl, input.ssl, .ssl-menu .menu-title {
+  background-image: url(../images/ssl.png);
+  background-repeat: no-repeat;
+  background-position: 8px 3px;
+  padding-left: 30px;
+}
+
 .filter a, a.edit, input.filter {
   background-image: url(../icon/filter.png);
   background-repeat: no-repeat;
@@ -1093,8 +1100,13 @@ body .ui-widget-content a {
   padding: 0 16px;
 }
 
-th.headerSortUp { 
-  background-image: url(../images/asc.gif); 
+textarea.cert {
+    font-family: Courier New, Courier, monospace, fixed;
+    font-size: 12px;
+}
+
+th.headerSortUp {
+  background-image: url(../images/asc.gif);
   background-repeat: no-repeat;
   background-position: right; 
   cursor: pointer; 
@@ -1196,4 +1208,6 @@ th.headerSortDown {
 		float: none;
 		width:auto;
 	}
+textarea[readonly='readonly'] {
+  background-color: #ddd;
 }

etc/alternc/templates/alternc/apache2.conf

@@ -75,6 +75,9 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
   Order allow,deny
   Allow from all
 </Directory>
+<Directory /var/lib/alternc/ssl-cert-alias/>
+	      allow from all
+</Directory>
 
 <VirtualHost *:80>
   Include /etc/alternc/bureau.conf

install/mysql.sql

@@ -770,3 +770,43 @@ CREATE TABLE IF NOT EXISTS `csrf` (
 -- make it re-exec-proof
 DELETE FROM alternc_status WHERE name='alternc_version';
 INSERT INTO alternc_status SET name='alternc_version',value='3.4.8.sql';
+
+-- SSL managment
+CREATE TABLE `certificates` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `uid` int(10) unsigned NOT NULL,
+  `status` tinyint(3) unsigned NOT NULL,
+  `shared` tinyint(3) unsigned NOT NULL,
+  `fqdn` varchar(255) NOT NULL,
+  `altnames` text NOT NULL,
+  `validstart` datetime NOT NULL,
+  `validend` datetime NOT NULL,
+  `sslcsr` text NOT NULL,
+  `sslkey` text NOT NULL,
+  `sslcrt` text NOT NULL,
+  `sslchain` text NOT NULL,
+  `ssl_action` varchar(32) NOT NULL,
+  `ssl_result` varchar(32) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `uid` (`uid`),
+  KEY `ssl_action` (`ssl_action`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `certif_alias` (
+  `name` varchar(255) NOT NULL,
+  `content` text NOT NULL,
+  `uid` int(10) unsigned NOT NULL,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`name`),
+  KEY `uid` (`uid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Global aliases defined for SSL certificates FILE validation processes';
+
+CREATE TABLE IF NOT EXISTS `certif_hosts` (
+  `certif` int(10) unsigned NOT NULL,
+  `sub` int(10) unsigned NOT NULL,
+  `uid` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`certif`,`sub`),
+  KEY `uid` (`uid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='VHosts of a user using defined or self-signed certificates';
+
+INSERT IGNORE INTO defquotas VALUES ('ssl', 0, 'default');

ssl/panel/index.php

@@ -1,3 +0,0 @@
-<?php
-    header("location: admin/");
-?>

ssl/panel/locales/Makefile

@@ -1,8 +0,0 @@
-all: ssl.pot */LC_MESSAGES/ssl.po
-
-ssl.pot: ../*/*.php
-	[ -r $@ ] || touch $@
-	xgettext --copyright-holder="AlternC Team" --package-name="AlternC" --package-version="2.0" --msgid-bugs-address="i18n@alternc.org"  --force-po -o $@ --keyword=__ --keyword=_  -L PHP -F --from-code UTF-8 $^
-
-%/LC_MESSAGES/ssl.po: ssl.pot
-	msgmerge -v -U $@ $^

ssl/panel/locales/README

@@ -1,46 +0,0 @@
-Le système de langue fonctionne ainsi : 
-
-dans bureau/locales/ on trouve un DOSSIER par langue sous la forme
-major_minor/
-exemple : fr_FR en_US ...
-dans lequel on a un sous-dossier LC_MESSAGES
-dans lequel on a des fichiers .po en vrac (normalement 1 ou 2 fichiers .po par module d'AlternC.)
-
-Le fichier alternc.mo est donc construit à partir de TOUS les fichiers .po d'une même langue.
-
-Pour mettre a jour les fichiers .po a partir des sources : 
-
-cd bureau/locales
-make 
-
-puis allez voir les fichiers .po pour les mettre a jour (cherchez les fuzzy et les msgstr vide a remplir)
-
-une fois les modifications effectuees, lancer svn commit pour valider vos modifications dans les sources officielles d'AlternC.
-
-Howto translate AlternC in a new language
-=========================================
-
-This folder contains po and pot files, who are templates that allows you
-to translate AlternC in any language.
-
-1. How to add a language : 
-- create a folder with your iso language code (ex: de_DE for
-  German from Germany see `dpkg-reconfigure locales` for available codes.)
-- create a subfolder LC_MESSAGES in this folder
-- copy .po and .pot files and rename .pot to .po
-- Translate them ;) 
-- Send them to us so that we can add them to the next release or as a language pack.
-
-2. How to update language files.
-
-When the programm is updated, the po files in locales/ are changed to
-reflect the new developped features.
-
-You can just call the makefile to have the files regenerated:
-
-cd bureau/locales
-make
-
-from "locales/" to update your language po files. New strings will have
-an empty "msgstr" value, and obsoletes one will be commented out with
-#~

ssl/ssl.sql

@@ -1,39 +0,0 @@
-
-CREATE TABLE `certificates` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `uid` int(10) unsigned NOT NULL,
-  `status` tinyint(3) unsigned NOT NULL,
-  `shared` tinyint(3) unsigned NOT NULL,
-  `fqdn` varchar(255) NOT NULL,
-  `altnames` text NOT NULL,
-  `validstart` datetime NOT NULL,
-  `validend` datetime NOT NULL,
-  `sslcsr` text NOT NULL,
-  `sslkey` text NOT NULL,
-  `sslcrt` text NOT NULL,
-  `sslchain` text NOT NULL,
-  `ssl_action` varchar(32) NOT NULL,
-  `ssl_result` varchar(32) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `uid` (`uid`),
-  KEY `ssl_action` (`ssl_action`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `certif_alias` (
-  `name` varchar(255) NOT NULL,
-  `content` text NOT NULL,
-  `uid` int(10) unsigned NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`name`),
-  KEY `uid` (`uid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Global aliases defined for SSL certificates FILE validation processes';
-
-CREATE TABLE IF NOT EXISTS `certif_hosts` (
-  `certif` int(10) unsigned NOT NULL,
-  `sub` int(10) unsigned NOT NULL,
-  `uid` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`certif`,`sub`),
-  KEY `uid` (`uid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='VHosts of a user using defined or self-signed certificates';
-
-INSERT IGNORE INTO defquotas VALUES ('ssl', 0, 'default');