Merge pull request #79 from mekanix/feature/ansible

Use ansible galaxy
freenit-framework · Sep 22, 2020 · 123ff29 · 123ff29
2 parents 9a508aa + 0867e04
commit 123ff29
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 66 deletions.
diff --git a/bin/freenit.sh b/bin/freenit.sh
@@ -4,7 +4,7 @@ set -e
 
 
 if [ "${1}" = "--version" ]; then
-  echo "0.1.13"
+  echo "0.1.14"
   exit 0
 fi
 
@@ -47,3 +47,17 @@ SYSPKG := YES
 
 .include <\${REGGAE_PATH}/mk/service.mk>
 EOF
+
+echo "- onelove-roles.freebsd_freenit" >>requirements.yml
+if [ "${TYPE}" = "sql" ]; then
+  echo "- onelove-roles.freebsd_freenit_sql" >>requirements.yml
+  echo "    - onelove-roles.freebsd_freenit_sql" >>templates/site.yml.tpl
+elif [ "${TYPE}" = "mongo" ]; then
+  echo "- onelove-roles.freebsd_freenit_mongoengine" >>requirements.yml
+  echo "    - onelove-roles.freebsd_freenit_mongoengine" >>templates/site.yml.tpl
+elif [ "${TYPE}" = "all" ]; then
+  echo "- onelove-roles.freebsd_freenit_sql" >>requirements.yml
+  echo "- onelove-roles.freebsd_freenit_mongoengine" >>requirements.yml
+  echo "    - onelove-roles.freebsd_freenit_sql" >>templates/site.yml.tpl
+  echo "    - onelove-roles.freebsd_freenit_mongoengine" >>templates/site.yml.tpl
+fi
diff --git a/freenit/project/ansible/roles/.keep b/freenit/project/ansible/roles/.keep
diff --git a/freenit/project/ansible/roles/devel/handlers/main.yml b/freenit/project/ansible/roles/devel/handlers/main.yml
diff --git a/freenit/project/ansible/roles/devel/tasks/main.yml b/freenit/project/ansible/roles/devel/tasks/main.yml
diff --git a/freenit/project/ansible/roles/devel/templates/uwsgi.ini.j2 b/freenit/project/ansible/roles/devel/templates/uwsgi.ini.j2
diff --git a/freenit/project/ansible/roles/devel/templates/uwsgi.j2 b/freenit/project/ansible/roles/devel/templates/uwsgi.j2
diff --git a/freenit/project/ansible/roles/devel/vars/main.yml b/freenit/project/ansible/roles/devel/vars/main.yml
diff --git a/freenit/project/requirements.yml b/freenit/project/requirements.yml
@@ -1 +1,2 @@
 - onelove-roles.freebsd-common
+- onelove-roles.freebsd_freenit
diff --git a/freenit/project/templates/site.yml.tpl b/freenit/project/templates/site.yml.tpl
@@ -6,4 +6,4 @@
   hosts: SERVICE
   roles:
     - onelove-roles.freebsd-common
-    - devel
+    - onelove-roles.freebsd_freenit
diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 
 setup(
     name='freenit',
-    version='0.1.13',
+    version='0.1.14',
     description='REST API framework based on Flask-Smorest',
     long_description=README,
     long_description_content_type='text/markdown',
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		- onelove-roles.freebsd-common
		- onelove-roles.freebsd_freenit