From c713daa97ffd866bfcbe90056b5028596be5f586 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Thu, 21 May 2015 11:36:29 +0200 Subject: [PATCH] Drop the admin config since we don't require it in the DB anymore --- roles/pagure/frontend/tasks/main.yml | 9 +- .../frontend/templates/pagure_admin.cfg | 121 ------------------ 2 files changed, 4 insertions(+), 126 deletions(-) delete mode 100644 roles/pagure/frontend/templates/pagure_admin.cfg diff --git a/roles/pagure/frontend/tasks/main.yml b/roles/pagure/frontend/tasks/main.yml index 5ecb3da87a..887efb773b 100644 --- a/roles/pagure/frontend/tasks/main.yml +++ b/roles/pagure/frontend/tasks/main.yml @@ -139,11 +139,11 @@ - name: copy sundry pagure configuration template: src={{ item.file }} - dest={{ item.location }}/{{ item.dest }} - owner=apache group=apache mode=0600 + dest={{ item.location }}/{{ item.file }} + owner=git group=postfix mode=0640 with_items: - - { file: pagure_admin.cfg, location: /etc/pagure, dest: pagure.cfg } -# - { file: alembic.ini, location: /etc/pagure, dest: alembic.ini } + - { file: pagure.cfg, location: /etc/pagure } +# - { file: alembic.ini, location: /etc/pagure } changed_when: "1 != 1" tags: - config @@ -191,7 +191,6 @@ dest={{ item.location }}/{{ item.file }} owner={{ item.user }} group={{ item.group }} mode={{ item.mode }} with_items: - - { file: pagure.cfg, location: /etc/pagure, user: git, group: postfix, mode: 640 } - { file: pagure.conf, location: /etc/httpd/conf.d, user: apache, group: apache, mode: 600 } tags: - config diff --git a/roles/pagure/frontend/templates/pagure_admin.cfg b/roles/pagure/frontend/templates/pagure_admin.cfg deleted file mode 100644 index f9ddd00c56..0000000000 --- a/roles/pagure/frontend/templates/pagure_admin.cfg +++ /dev/null @@ -1,121 +0,0 @@ -from datetime import timedelta - -### Set the time after which the admin session expires -# There are two sessions on pagure, login that holds for 31 days and -# the session defined here after which an user has to re-login. -# This session is used when accessing all administrative parts of pagure -# (ie: changing a project's or a user's settings) -ADMIN_SESSION_LIFETIME = timedelta(minutes=20) - -### Secret key for the Flask application -SECRET_KEY='{{ pagure_secret_key }}' - -### url to the database server: -#DB_URL=mysql://user:pass@host/db_name -#DB_URL=postgres://user:pass@host/db_name -DB_URL = 'postgresql://{{ pagure_db_admin_user }}:{{ pagure_db_admin_pass }}@{{ pagure_db_host }}/{{ pagure_db_name }}' - -### The FAS group in which the admin of pagure are -ADMIN_GROUP = ['sysadmin-main'] - -### The email address to which the flask.log will send the errors (tracebacks) -EMAIL_ERROR = 'pingou@pingoured.fr' - -### Default SMTP server to use for sending emails -SMTP_SERVER = 'localhost' - -### Email used to sent emails -{% if env == 'pagure-staging' %} -FROM_EMAIL = 'pagure@stg.pagure.io' -{% else %} -FROM_EMAIL = 'pagure@pagure.io' -{% endif %} - -### The URL at which the project is available. -{% if env == 'pagure-staging' %} -APP_URL = 'https://dev.pagure.io/' -{% else %} -APP_URL = 'https://pagure.io/' -{% endif %} - -### The URL to use to clone git repositories. -GIT_URL_SSH = 'git@pagure.io' -GIT_URL_GIT = 'git://pagure.io' - -### Folder containing to the git repos -GIT_FOLDER = '/srv/git/repositories' - -### Folder containing the forks repos -FORK_FOLDER = '/srv/git/repositories/forks' - -### Folder containing the docs repos -DOCS_FOLDER = '/srv/git/repositories/docs' - -### Folder containing the pull-requests repos -REQUESTS_FOLDER = '/srv/git/repositories/requests' - - -### Configuration file for gitolite -GITOLITE_CONFIG = '/etc/gitolite/conf/gitolite.conf' - - -### Home folder of the gitolite user -### Folder where to run gl-compile-conf from -GITOLITE_HOME = '/srv/git/' - -### Folder containing all the public ssh keys for gitolite -GITOLITE_KEYDIR = '/etc/gitolite/keydir/' - -### Path to the gitolite.rc file -GL_RC = '/etc/gitolite/gitolite.rc' - -### Path to the /bin directory where the gitolite tools can be found -GL_BINDIR = '/usr/bin/' - - -# Optional configuration - -### Number of items displayed per page -# Used when listing items -ITEM_PER_PAGE = 50 - -### Maximum size of the uploaded content -# Used to limit the size of file attached to a ticket for example -MAX_CONTENT_LENGTH = 4 * 1024 * 1024 # 4 megabytes - -### Lenght for short commits ids or file hex -SHORT_LENGTH = 6 - -### List of blacklisted project names that can conflicts for pagure's URLs -### or other -BLACKLISTED_PROJECTS = ['static', 'pv'] - - -# Authentication related configuration option - -### Switch the authentication method -# Specify which authentication method to use, defaults to `fas` can be or -# `local` -# Default: ``fas``. -PAGURE_AUTH = 'fas' - -# When this is set to True, the session cookie will only be returned to the -# server via ssl (https). If you connect to the server via plain http, the -# cookie will not be sent. This prevents sniffing of the cookie contents. -# This may be set to False when testing your application but should always -# be set to True in production. -# Default: ``True``. -SESSION_COOKIE_SECURE = True - -# The name of the cookie used to store the session id. -# Default: ``.pagure``. -SESSION_COOKIE_NAME = 'pagure' - -# Boolean specifying wether to check the user's IP address when retrieving -# its session. This make things more secure (thus is on by default) but -# under certain setup it might not work (for example is there are proxies -# in front of the application). -CHECK_SESSION_IP = True - -# Used by SESSION_COOKIE_PATH -APPLICATION_ROOT = '/'