diff options
| -rw-r--r-- | build.ant | 21 | ||||
| -rw-r--r-- | res/template.d/base.html (renamed from res/templates/base.html) | 0 | ||||
| -rw-r--r-- | res/template.d/index.html (renamed from res/templates/index.html) | 0 | ||||
| -rw-r--r-- | res/template.d/login.html (renamed from res/templates/login.html) | 0 | ||||
| -rw-r--r-- | res/template.d/pw_reset.html (renamed from res/templates/pw_reset.html) | 0 | ||||
| -rw-r--r-- | res/template.d/user_signup.html (renamed from res/templates/user_signup.html) | 0 |
6 files changed, 14 insertions, 7 deletions
@@ -105,10 +105,10 @@ <property name="src_server" value="src/server" /> <mkdir dir="${targetDeploymentDir}/static" /> - <mkdir dir="${targetDeploymentDir}/templates" /> - <mkdir dir="${targetDeploymentDir}/templates/fragment" /> + <mkdir dir="${targetDeploymentDir}/template.d" /> + <mkdir dir="${targetDeploymentDir}/template.d/fragment.d" /> - <generate_version_tag output="res/templates/fragment" /> + <generate_version_tag output="res/template.d/fragment.d" /> <!-- note: defaults to not overwriting, so rhizi-server.conf is safe --> @@ -131,7 +131,8 @@ <!-- res --> <rsync src="res/client/" dst="${targetDeploymentDir}/static" /> - <rsync src="res/templates/" dst="${targetDeploymentDir}/templates/" /> + <rsync src="res/template.d/" + dst="${targetDeploymentDir}/template.d/" /> <!-- auth--> <copy file="res/etc/user_db.db" @@ -141,7 +142,7 @@ <!-- domain specific defaults--> <copy file="res/etc/rhizi-server.conf.example" tofile="res/etc/rhizi-server.conf" /> - <copy todir="${targetDeploymentDir}/templates/fragment" + <copy todir="${targetDeploymentDir}/template.d/fragment.d" failonerror="false"> <fileset dir="res/local/template/fragment/by-domain/${defaultDomain}" includes="*" /> @@ -156,7 +157,7 @@ <!-- domain specific overrides --> <copy file="src/local/domain/${targetDomain}/domain_types.js" tofile="${targetDeploymentDir}/static/js/model/domain_types.js" /> - <copy todir="${targetDeploymentDir}/templates/fragment" + <copy todir="${targetDeploymentDir}/template.d/fragment.d" overwrite="true" failonerror="false"> <fileset dir="res/local/template/fragment/by-domain/${targetDomain}" /> @@ -222,6 +223,8 @@ <mkdir dir="dist" /> <mkdir dir="${build_dir__deb_pkg}" /> + <mkdir dir="${build_dir__deb_pkg}/template.d" /> + <mkdir dir="${build_dir__deb_pkg}/template.d/fragment.d" /> <exec dir="${basedir}" executable="/usr/bin/git"> <arg value="clone" /> @@ -230,12 +233,16 @@ <arg value="${build_dir__deb_pkg}" /> </exec> - <generate_version_tag output="${build_dir__deb_pkg}/res/templates/fragment/" /> <copy todir="${build_dir__deb_pkg}/debian"> <fileset dir="res/debian/pkg__rhizi-common" /> <fileset dir="res/debian/pkg__${pkg_variant}" /> </copy> + <generate_version_tag output="${build_dir__deb_pkg}/res/template.d/fragment.d/" /> + <replace file="${build_dir__deb_pkg}/control" + token="\${package-name}" + value="${package_name}" /> + <delete verbose="true" includeemptydirs="true"> <fileset dir="${build_dir__deb_pkg}" includes="Makefile" /> <fileset dir="${build_dir__deb_pkg}" includes="**/*.scss" /> diff --git a/res/templates/base.html b/res/template.d/base.html index 7369984d..7369984d 100644 --- a/res/templates/base.html +++ b/res/template.d/base.html diff --git a/res/templates/index.html b/res/template.d/index.html index 3a1d921e..3a1d921e 100644 --- a/res/templates/index.html +++ b/res/template.d/index.html diff --git a/res/templates/login.html b/res/template.d/login.html index b3e4cfd0..b3e4cfd0 100644 --- a/res/templates/login.html +++ b/res/template.d/login.html diff --git a/res/templates/pw_reset.html b/res/template.d/pw_reset.html index 908f5597..908f5597 100644 --- a/res/templates/pw_reset.html +++ b/res/template.d/pw_reset.html diff --git a/res/templates/user_signup.html b/res/template.d/user_signup.html index 93589d86..93589d86 100644 --- a/res/templates/user_signup.html +++ b/res/template.d/user_signup.html |