Merge branch 'master' into development

Author: Numerico

.Dockerfile.swo

@@ -1,2 +1,4 @@
 *.pyc
 *.swp
+*.retry
+*.db

.gitignore

@@ -0,0 +1,2 @@
+[defaults]
+inventory = ./hosts.production

ansible.cfg

@@ -0,0 +1,43 @@
+---
+
+- name: medios_bot
+  hosts: all
+  become: yes
+  
+  vars: # == name?
+    stack: medios_bot
+    
+  tasks:
+    - name: ensure python is present
+      apt: name=python state=present
+      
+    - name: docker-py is deprecated
+      pip: 
+        name: docker-py
+#        state: absent
+#        version: '>= 1.7.0'
+    
+    - name: docker requirement for ansible docker
+      pip:
+        name: docker
+        state: present
+      
+    #(-compose) TODO
+  
+    - name: pull imagen del bot
+      docker_image:
+        name: numericalatina/medios_bot
+        force: yes # pull
+  
+    - name: pull imagen mariadb
+      docker_image:
+        name: mariadb
+  
+    - name: copiar docker-compose.yml
+      template: 
+        dest: "~/medios_bot.yml"
+        src: docker-compose.yml
+
+    - name: actualizar stack de docker
+      command: "docker stack deploy -c ~/medios_bot.yml {{stack}}"
+

bot.yml

@@ -1,20 +1,42 @@
 version: "3"
 services:
   bot:
-    image: medios_bot
-    deploy:
-      replicas: 1
-    ports:
-      - "80:8000"
+    image: numericalatina/medios_bot
+    restart: always
+    networks:
+      - bot_db
+
+  mariadb:
+    image: mariadb
+    restart: always
+    volumes:
+      - bot_db_data:/var/lib/mysql
     networks:
-      - red
-    depends_on:
-      - db
-  db:
-    image: postgres
+      - bot_db
     environment:
-      POSTGRES_PASSWORD: laSextaDeclaracion
+      MYSQL_ROOT_PASSWORD: "{{ vault_MYSQL_ROOT_PASSWORD }}"
+      MYSQL_DATABASE: "{{ vault_MYSQL_DATABASE }}"
+      MYSQL_USER: "{{ vault_MYSQL_USER }}"
+      MYSQL_PASSWORD: "{{ vault_MYSQL_PASSWORD }}"
+
+  wordpress:
+    image: wordpress
+    restart: always
+    volumes:
+      - wp_bot_vol:/var/www/html
     networks:
-      - red
+      - bot_db
+    environment:
+      WORDPRESS_DB_HOST: mariadb:3306
+      WORDPRESS_DB_NAME: "{{ vault_MYSQL_DATABASE }}"
+      WORDPRESS_DB_USER: "{{ vault_MYSQL_USER }}"
+      WORDPRESS_DB_PASSWORD: "{{ vault_MYSQL_PASSWORD }}"
+    ports:
+      - "8888:80"
+
 networks:
-  red:
+  bot_db:
+
+volumes:
+  wp_bot_vol:
+  bot_db_data:

docker-compose.yml

@@ -0,0 +1,14 @@
+$ANSIBLE_VAULT;1.1;AES256
+34356263383534323061393932376562326238663665343034353566326333376166373633393330
+6461373462626330323635393737333335343334353365300a356431633330336133626461623835
+30303561663239316539623933613034336231663836646361303466313662633631633434303131
+6232616633396364390a333365663331623762383961373838653636313762346539316634663837
+34623465653364643935393133623866633963643636336163653736393439316634363732353961
+63343431353762616639613030613337663836346431636532646136633362383333633432323339
+63313465303938383333386238613034653339653466613530633034383930333134343738363264
+61303236356166363363313961646433323331643462663165373864613530643830376130643535
+64383031363933353833373061633463363236333362323233383064613335353361373234613832
+65323438366331396163626237303633363836356237623865373835613434333235303361383636
+65623363316463633562386634326433613130353065646163643132323061396237643266333062
+65326138613036366333383532303839613239633163306535663131313635623131313164653130
+3531

group_vars/all

@@ -0,0 +1,5 @@
+[digitalocean]
+numerica.cl 
+
+[digitalocean:vars]
+ansible_ssh_user=root

hosts.production

@@ -1,5 +1,7 @@
 from django.db import models
 
+# DJANGO
+
 class Texto(models.Model):
     texto = models.TextField()
 
@@ -8,3 +10,139 @@ class Ubicacion(models.Model):
     longi = models.FloatField()
     usuario = models.CharField(max_length=50) # TODO model
     tiempo = models.DateTimeField(auto_now=True) # redundante?
+
+# WORDPRESS unmanaged
+# obtained by inspectdb
+
+class WpPosts(models.Model):
+    id = models.BigAutoField(db_column='ID', primary_key=True)  # Field name made lowercase.
+    post_author = models.BigIntegerField()
+    post_date = models.DateTimeField()
+    post_date_gmt = models.DateTimeField()
+    post_content = models.TextField()
+    post_title = models.TextField()
+    post_excerpt = models.TextField()
+    post_status = models.CharField(max_length=20)
+    comment_status = models.CharField(max_length=20)
+    ping_status = models.CharField(max_length=20)
+    post_password = models.CharField(max_length=255)
+    post_name = models.CharField(max_length=200)
+    to_ping = models.TextField()
+    pinged = models.TextField()
+    post_modified = models.DateTimeField()
+    post_modified_gmt = models.DateTimeField()
+    post_content_filtered = models.TextField()
+    post_parent = models.BigIntegerField()
+    guid = models.CharField(max_length=255)
+    menu_order = models.IntegerField()
+    post_type = models.CharField(max_length=20)
+    post_mime_type = models.CharField(max_length=100)
+    comment_count = models.BigIntegerField()
+
+    class Meta:
+        managed = False
+        db_table = 'wp_posts'
+
+class WpPostmeta(models.Model):
+    meta_id = models.BigAutoField(primary_key=True)
+    post_id = models.BigIntegerField()
+    meta_key = models.CharField(max_length=255, blank=True, null=True)
+    meta_value = models.TextField(blank=True, null=True)
+
+    class Meta:
+        managed = False
+        db_table = 'wp_postmeta'
+
+class WpComments(models.Model):
+    comment_id = models.BigAutoField(db_column='comment_ID', primary_key=True)  # Field name made lowercase.
+    comment_post_id = models.BigIntegerField(db_column='comment_post_ID')  # Field name made lowercase.
+    comment_author = models.TextField()
+    comment_author_email = models.CharField(max_length=100)
+    comment_author_url = models.CharField(max_length=200)
+    comment_author_ip = models.CharField(db_column='comment_author_IP', max_length=100)  # Field name made lowercase.
+    comment_date = models.DateTimeField()
+    comment_date_gmt = models.DateTimeField()
+    comment_content = models.TextField()
+    comment_karma = models.IntegerField()
+    comment_approved = models.CharField(max_length=20)
+    comment_agent = models.CharField(max_length=255)
+    comment_type = models.CharField(max_length=20)
+    comment_parent = models.BigIntegerField()
+    user_id = models.BigIntegerField()
+
+    class Meta:
+        managed = False
+        db_table = 'wp_comments'
+
+class WpCommentmeta(models.Model):
+    meta_id = models.BigAutoField(primary_key=True)
+    comment_id = models.BigIntegerField()
+    meta_key = models.CharField(max_length=255, blank=True, null=True)
+    meta_value = models.TextField(blank=True, null=True)
+
+    class Meta:
+        managed = False
+        db_table = 'wp_commentmeta'
+
+class WpLinks(models.Model):
+    link_id = models.BigAutoField(primary_key=True)
+    link_url = models.CharField(max_length=255)
+    link_name = models.CharField(max_length=255)
+    link_image = models.CharField(max_length=255)
+    link_target = models.CharField(max_length=25)
+    link_description = models.CharField(max_length=255)
+    link_visible = models.CharField(max_length=20)
+    link_owner = models.BigIntegerField()
+    link_rating = models.IntegerField()
+    link_updated = models.DateTimeField()
+    link_rel = models.CharField(max_length=255)
+    link_notes = models.TextField()
+    link_rss = models.CharField(max_length=255)
+
+    class Meta:
+        managed = False
+        db_table = 'wp_links'
+
+class WpTerms(models.Model):
+    term_id = models.BigAutoField(primary_key=True)
+    name = models.CharField(max_length=200)
+    slug = models.CharField(max_length=200)
+    term_group = models.BigIntegerField()
+
+    class Meta:
+        managed = False
+        db_table = 'wp_terms'
+
+class WpTermTaxonomy(models.Model):
+    term_taxonomy_id = models.BigAutoField(primary_key=True)
+    term_id = models.BigIntegerField()
+    taxonomy = models.CharField(max_length=32)
+    description = models.TextField()
+    parent = models.BigIntegerField()
+    count = models.BigIntegerField()
+
+    class Meta:
+        managed = False
+        db_table = 'wp_term_taxonomy'
+        unique_together = (('term_id', 'taxonomy'),)
+
+class WpTermRelationships(models.Model):
+    object_id = models.BigIntegerField(primary_key=True)
+    term_taxonomy_id = models.BigIntegerField()
+    term_order = models.IntegerField()
+
+    class Meta:
+        managed = False
+        db_table = 'wp_term_relationships'
+        unique_together = (('object_id', 'term_taxonomy_id'),)
+
+class WpTermmeta(models.Model):
+    meta_id = models.BigAutoField(primary_key=True)
+    term_id = models.BigIntegerField()
+    meta_key = models.CharField(max_length=255, blank=True, null=True)
+    meta_value = models.TextField(blank=True, null=True)
+
+    class Meta:
+        managed = False
+        db_table = 'wp_termmeta'
+

medios_libres/medios_libres/models.py

@@ -25,7 +25,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['numerica.cl']
 
 
 # Application definition

medios_libres/medios_libres/settings.py

@@ -1,3 +1,3 @@
 pyTelegramBotAPI
-django
-psycopg2
+django<2
+mysqlclient