new domainoption php5

hsarback/database/data.sql

@@ -195,6 +195,8 @@ INSERT INTO domain_option (domain_option_name)
 	VALUES ('multiviews');
 INSERT INTO domain_option (domain_option_name) 
 	VALUES ('letsencrypt');
+INSERT INTO domain_option (domain_option_name) 
+	VALUES ('php5');
 
 --
 -- table: price_list

hsarback/database/database_update.sql

@@ -1,96 +1,2 @@
 INSERT INTO domain_option (domain_option_name) 
-	VALUES ('letsencrypt');
+	VALUES ('php5');
-
-ALTER TABLE domain 
-	ADD COLUMN valid_subdomain_names CHARACTER VARYING(512);
-
-UPDATE domain 
-	SET valid_subdomain_names = '*' ;
-
-INSERT INTO contactrole_ref (contact_id, role) 
-	( SELECT contact_id, 'voting-right' FROM contact );
-
-CREATE TABLE member_asset (
-    member_asset_id integer NOT NULL,
-    bp_id integer NOT NULL,
-    date date,
-    action character varying(60),
-    amount numeric,
-    comment character varying(160)
-);
-
-CREATE SEQUENCE member_asset_member_asset_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE member_asset_member_asset_id_seq OWNED BY member_asset.member_asset_id;
-
-ALTER TABLE ONLY member_asset ALTER COLUMN member_asset_id SET DEFAULT nextval('member_asset_member_asset_id_seq'::regclass);
-    
-CREATE TABLE member_share (
-    member_share_id integer NOT NULL,
-    bp_id integer NOT NULL,
-    date date,
-    action character varying(60),
-    quantity integer,
-    comment character varying(160)
-);
-
-CREATE SEQUENCE member_share_member_share_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE member_share_member_share_id_seq OWNED BY member_share.member_share_id;
- 
-ALTER TABLE ONLY member_share ALTER COLUMN member_share_id SET DEFAULT nextval('member_share_member_share_id_seq'::regclass);
-
-ALTER TABLE ONLY member_asset
-    ADD CONSTRAINT pk_member_asset PRIMARY KEY (member_asset_id);
-
-ALTER TABLE ONLY member_share
-    ADD CONSTRAINT pk_member_share PRIMARY KEY (member_share_id);
-
-ALTER TABLE ONLY member_asset
-    ADD CONSTRAINT pk_member_asset PRIMARY KEY (member_asset_id);
-   
-ALTER TABLE business_partner DROP CONSTRAINT ckc_shares_signed_business;
-
-ALTER TABLE business_partner DROP COLUMN shares_updated ;
-
-ALTER TABLE business_partner DROP COLUMN shares_signed ;
-
-CREATE TABLE pac_administration (
-    pac_administration_id integer NOT NULL,
-    contact_id integer NOT NULL,
-    pac_id integer NOT NULL
-);
-
-CREATE SEQUENCE pac_administration_pac_administration_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE pac_administration_pac_administration_id_seq OWNED BY pac_administration.pac_administration_id;
-
-ALTER TABLE ONLY pac_administration 
-	ALTER COLUMN pac_administration_id SET DEFAULT nextval('pac_administration_pac_administration_id_seq'::regclass);
-	
-ALTER TABLE ONLY pac_administration
-    ADD CONSTRAINT pk_pac_administration PRIMARY KEY (pac_administration_id);
-
-ALTER TABLE ONLY pac_administration
-    ADD CONSTRAINT pac_administration_contact_ref FOREIGN KEY (contact_id) REFERENCES contact(contact_id);
-
-ALTER TABLE ONLY pac_administration
-    ADD CONSTRAINT pac_administration_pac_ref FOREIGN KEY (pac_id) REFERENCES packet(packet_id);
-
-ALTER TABLE ONLY contact
-	ADD COLUMN login character varying(40);

hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java

@@ -28,6 +28,7 @@ public class DomainModuleImpl extends AbstractModuleImpl {
 	public static final String DOMOPT_INCLUDES = "includes";
 	public static final String DOMOPT_BACKUPFOREXTERNALMX = "backupmxforexternalmx";
 	public static final String DOMOPT_LETSENCRYPT = "letsencrypt";
+	public static final String DOMOPT_PHP5 = "php5";
 	
 	public static final String[] ALL_DOMOPTS = 
 			new String[] { 
@@ -37,7 +38,8 @@ public class DomainModuleImpl extends AbstractModuleImpl {
 					DOMOPT_HTDOCSFALLBACK, 
 					DOMOPT_INCLUDES, 
 					DOMOPT_BACKUPFOREXTERNALMX,
-					DOMOPT_LETSENCRYPT
+					DOMOPT_LETSENCRYPT,
+					DOMOPT_PHP5
 			};
 	public static final String[] DEFAULT_DOMOPTS = 
 			new String[] { 

hsarback/src/de/hsadmin/mods/dom/DomainOptionValues.java

@@ -25,6 +25,7 @@ public class DomainOptionValues extends DefaultSelectableValues {
 		list.add(new BooleanListValue("indexes"));
 		list.add(new BooleanListValue("multiviews"));
 		list.add(new BooleanListValue("letsencrypt"));
+		list.add(new BooleanListValue("php5"));
 		return list;
 	}
 

hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java

@@ -275,6 +275,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
 		ifOption(templateVars, query, "multiviews", "+MultiViews", "-MultiViews");
 		ifOption(templateVars, query, "htdocsfallback", Boolean.TRUE, Boolean.FALSE);
 		ifOption(templateVars, query, "letsencrypt", Boolean.TRUE, Boolean.FALSE);
+		ifOption(templateVars, query, "php5", Boolean.TRUE, Boolean.FALSE);
 		final boolean isSetLetsencryptOption = templateVars.get("letsencrypt").equals(Boolean.TRUE);
 		final Processor domSetupProcessor = new CompoundProcessor(
 			isSetLetsencryptOption ? new NullProcessor() : new ShellProcessor("rm -f /etc/apache2/pems-generated/" + domName + ".crt"),

hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm

@@ -45,6 +45,10 @@
         Options +ExecCGI -Includes -Indexes -MultiViews +SymLinksIfOwnerMatch
     </Location>
 
+#if( ${php5} )
+	FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php5
+#end
+
     RewriteEngine On
     RewriteOptions Inherit
 
@@ -120,6 +124,10 @@
         Options +ExecCGI -Includes -Indexes -MultiViews +SymLinksIfOwnerMatch
     </Location>
     
+#if( ${php5} )
+	FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php5
+#end
+
     RewriteEngine On
     RewriteOptions Inherit